fix docker merge

# Description of Changes

Fix replace-and-invert-color-pdf nav
Fix legacy homepage search
Closes #(2888)

---

## Checklist

### General

- [ x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x ] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [ ] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [ ] I have performed a self-review of my own code
- [ ] My changes generate no new warnings

### Documentation

- [ ] I have updated relevant docs on [Stirling-PDF's doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
(if functionality has heavily changed)
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

### UI Changes (if applicable)

- [ ] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)

### Testing (if applicable)

- [ ] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.

---------

Co-authored-by: Reece Browne <reece@stirling.pdf>

.github/workflows/build.yml

@@ -141,4 +141,4 @@ jobs:
         run: |
           chmod +x ./testing/test_webpages.sh
           chmod +x ./testing/test.sh
-          ./testing/test.sh "${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
+          ./testing/test.sh

.github/workflows/licenses-update.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: "17"
           distribution: "adopt"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
 
       - name: check the licenses for compatibility
         run: ./gradlew clean checkLicense

.github/workflows/multiOSReleases.yml

@@ -63,7 +63,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
         with:
           gradle-version: 8.12
 
@@ -151,7 +151,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
         with:
           gradle-version: 8.12
 

.github/workflows/push-docker.yml

@@ -30,7 +30,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
         with:
           gradle-version: 8.12
 

.github/workflows/releaseArtifacts.yml

@@ -35,7 +35,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
         with:
           gradle-version: 8.12
 

.github/workflows/sonarqube.yml

@@ -31,20 +31,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: Cache Gradle packages
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-
       - name: Build and analyze with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/swagger.yml

@@ -26,7 +26,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/sync_files.yml

@@ -8,8 +8,6 @@ on:
     paths:
       - "build.gradle"
       - "README.md"
-      - "gradle/verification-keyring.keys"
-      - "gradle/verification-metadata.xml"
       - "src/main/resources/messages_*.properties"
       - "src/main/resources/static/3rdPartyLicenses.json"
       - "scripts/ignore_translation.toml"
@@ -104,12 +102,6 @@ jobs:
           git add README.md
           git diff --staged --quiet || git commit -m ":memo: Sync README.md" || echo "no changes"
 
-      - name: Run git add
-        run: |
-          git add gradle/verification-keyring.keys
-          git add gradle/verification-metadata.xml
-          git diff --staged --quiet || git commit -m ":memo: Generate verification metadata with signatures and checksums" || echo "no changes"
-
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
@@ -119,11 +111,11 @@ jobs:
           author: ${{ needs.read_bot_entries.outputs.committer }}
           signoff: true
           branch: sync_readme
-          title: ":globe_with_meridians: Sync Translations + Update README Progress Table + Update Verification Metadata"
+          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
           body: |
             ### Description of Changes
 
-            This Pull Request was automatically generated to synchronize updates to translation files, verification metadata, and documentation. Below are the details of the changes made:
+            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:
 
             #### **1. Synchronization of Translation Files**
             - Updated translation files (`messages_*.properties`) to reflect changes in the reference file `messages_en_GB.properties`.
@@ -135,14 +127,9 @@ jobs:
             - Added a summary of the current translation status for all supported languages.
             - Included up-to-date statistics on translation coverage.
 
-            #### **3. Verification Metadata Updates**
-            - Generated or refreshed the `verification-keyring.keys` and `verification-metadata.xml` files.
-            - Included the latest dependency signatures and checksums to enhance the build's integrity.
-
             #### **Why these changes are necessary**
             - Keeps translation files aligned with the latest reference updates.
             - Ensures the documentation reflects the current translation progress.
-            - Strengthens dependency verification for a more secure build process.
 
             ---
 
@@ -156,5 +143,3 @@ jobs:
           add-paths: |
             README.md
             src/main/resources/messages_*.properties
-            gradle/verification-keyring.keys
-            gradle/verification-metadata.xml

Dockerfile

@@ -56,13 +56,15 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         openssl-dev \
         openjdk21-jre \
 # Doc conversion
+		gcompat \
+    	libc6-compat \
         libreoffice \
 # pdftohtml
         poppler-utils \
 # OCR MY PDF (unpaper for descew and other advanced features)
         tesseract-ocr-data-eng \
 # CV
-        py3-opencv \
+		py3-opencv \
 # python3/pip
         python3 \
         py3-pip && \

Dockerfile.fat

@@ -57,6 +57,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         openssl-dev \
         openjdk21-jre \
 # Doc conversion
+		gcompat \
+    	libc6-compat \
         libreoffice \
 # pdftohtml
         poppler-utils \
@@ -65,7 +67,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
         tesseract-ocr-data-eng \
         font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
 # CV
-        py3-opencv \
+		py3-opencv \
 # python3/pip
         python3 \
     py3-pip && \

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id "com.diffplug.spotless" version "7.0.2"
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
-    id("org.panteleyev.jpackageplugin") version "1.6.0"
+    id("org.panteleyev.jpackageplugin") version "1.6.1"
     id "org.sonarqube" version "6.0.1.5171"
 }
 
@@ -26,7 +26,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.40.1"
+version = "0.40.2"
 
 java {
     // 17 is lowest but we support and recommend 21

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -265,9 +265,6 @@ public class EndpointConfiguration {
         // Pdftohtml dependent endpoints
         addEndpointToGroup("Pdftohtml", "pdf-to-html");
         addEndpointToGroup("Pdftohtml", "pdf-to-markdown");
-
-        // disabled for now while we resolve issues
-        disableEndpoint("pdf-to-pdfa");
     }
 
     private void processEnvironmentConfigs() {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java

@@ -44,7 +44,7 @@ public class ConvertHtmlToPDF {
     @Operation(
             summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
             description =
-                    "This endpoint takes an HTML or ZIP file input and converts it to a PDF format.")
+                    "This endpoint takes an HTML or ZIP file input and converts it to a PDF format. Input:HTML Output:PDF Type:SISO")
     public ResponseEntity<byte[]> HtmlToPdf(@ModelAttribute HTMLToPdfRequest request)
             throws Exception {
         MultipartFile fileInput = request.getFileInput();

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -73,8 +73,8 @@ public class ConvertPDFToPDFA {
             // Determine PDF/A filter based on requested format
             String pdfFilter =
                     "pdfa".equals(outputFormat)
-                            ? "writer_pdf_Export:{'SelectPdfVersion':{'Value':'2'}}:writer_pdf_Export"
+                            ? "pdf:writer_pdf_Export:{\"SelectPdfVersion\":{\"type\":\"long\",\"value\":\"2\"}}"
-                            : "writer_pdf_Export:{'SelectPdfVersion':{'Value':'1'}}:writer_pdf_Export";
+                            : "pdf:writer_pdf_Export:{\"SelectPdfVersion\":{\"type\":\"long\",\"value\":\"1\"}}";
 
             // Prepare LibreOffice command
             List<String> command =
@@ -84,7 +84,7 @@ public class ConvertPDFToPDFA {
                                     "--headless",
                                     "--nologo",
                                     "--convert-to",
-                                    "pdf:" + pdfFilter,
+                                    pdfFilter,
                                     "--outdir",
                                     tempOutputDir.toString(),
                                     tempInputFile.toString()));

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -8,7 +8,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import io.swagger.v3.oas.annotations.Operation;
 import javax.imageio.ImageIO;
 
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
@@ -65,6 +65,9 @@ public class OCRController {
     }
 
     @PostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
+     @Operation(
+        summary = "Process PDF files with OCR using Tesseract",
+        description = "Takes a PDF file as input, performs OCR using specified languages and OCR type (skip-text/force-ocr), and returns the processed PDF. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> processPdfWithOCR(
             @ModelAttribute ProcessPdfWithOcrRequest request)
             throws IOException, InterruptedException {

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -218,6 +218,9 @@ public class ProcessExecutor {
             errorReaderThread.join();
             outputReaderThread.join();
 
+            boolean isQpdf =
+                    command != null && !command.isEmpty() && command.get(0).contains("qpdf");
+
             if (outputLines.size() > 0) {
                 String outputMessage = String.join("\n", outputLines);
                 messages += outputMessage;
@@ -233,20 +236,28 @@ public class ProcessExecutor {
                     log.warn("Command error output:\n" + errorMessage);
                 }
                 if (exitCode != 0) {
-                    throw new IOException(
+                    if (isQpdf && exitCode == 3) {
-                            "Command process failed with exit code "
+                        log.warn("qpdf succeeded with warnings: {}", messages);
-                                    + exitCode
+                    } else {
-                                    + ". Error message: "
+                        throw new IOException(
-                                    + errorMessage);
+                                "Command process failed with exit code "
+                                        + exitCode
+                                        + ". Error message: "
+                                        + errorMessage);
+                    }
                 }
             }
 
             if (exitCode != 0) {
-                throw new IOException(
+                if (isQpdf && exitCode == 3) {
-                        "Command process failed with exit code "
+                    log.warn("qpdf succeeded with warnings: {}", messages);
-                                + exitCode
+                } else {
-                                + "\nLogs: "
+                    throw new IOException(
-                                + messages);
+                            "Command process failed with exit code "
+                                    + exitCode
+                                    + "\nLogs: "
+                                    + messages);
+                }
             }
         } finally {
             semaphore.release();

src/main/resources/messages_en_GB.properties

@@ -1185,7 +1185,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
+pdfToPDFA.credit=This service uses libreoffice for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format

src/main/resources/messages_en_US.properties

@@ -1185,7 +1185,7 @@ changeMetadata.submit=Change
 #pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses qpdf for PDF/A conversion
+pdfToPDFA.credit=This service uses libreoffice for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format

src/main/resources/templates/fragments/navElements.html

@@ -1,19 +1,19 @@
 <th:block th:fragment="navElements">
-    <div id="groupOrganize" class="feature-group">
+  <div id="groupOrganize" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.organize})}">
+    </div>
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.organize})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry ('multi-tool', 'construction', 'home.multiTool.title', 'home.multiTool.desc', 'multiTool.tags', 'organize')}">
-        </div>
+      </div>
 
-        <div
+      <div
         th:replace="~{fragments/navbarEntry :: navbarEntry ('merge-pdfs', 'add_to_photos', 'home.merge.title', 'home.merge.desc', 'merge.tags', 'organize')}">
-        </div>
+      </div>
-        <div
+      <div
-        th:replace="~{fragments/navbarEntry :: navbarEntry ('split-pdfs', 'cut', 'home.split.title', 'home.split.desc', 'split.tags', 'organize')}"></div>
+        th:replace="~{fragments/navbarEntry :: navbarEntry ('split-pdfs', 'cut', 'home.split.title', 'home.split.desc', 'split.tags', 'organize')}">
-        <div
+      </div>
+      <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('rotate-pdf', 'rotate_right', 'home.rotate.title', 'home.rotate.desc', 'rotate.tags', 'organize')}">
       </div>
       <div
@@ -37,15 +37,14 @@
       <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('pdf-to-single-page', 'looks_one', 'home.PdfToSinglePage.title', 'home.PdfToSinglePage.desc', 'PdfToSinglePage.tags', 'organize')}">
       </div>
-      </div>
     </div>
+  </div>
 
-    <div id="groupConvertTo"  class="feature-group">
+  <div id="groupConvertTo" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
+    </div>
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('img-to-pdf', 'picture_as_pdf', 'home.imageToPdf.title', 'home.imageToPdf.desc', 'imageToPdf.tags', 'convertto')}">
       </div>
       <div
@@ -63,14 +62,13 @@
       <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('book-to-pdf', 'book', 'home.BookToPDF.title', 'home.BookToPDF.desc', 'BookToPDF.tags', 'convertto')}">
       </div>
-      </div>
     </div>
-    <div id="groupConvertFrom" class="feature-group">
+  </div>
+  <div id="groupConvertFrom" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
+    </div>
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('pdf-to-img', 'photo_library', 'home.pdfToImage.title', 'home.pdfToImage.desc', 'pdfToImage.tags', 'convert')}">
       </div>
       <div
@@ -98,17 +96,16 @@
         th:replace="~{fragments/navbarEntry :: navbarEntry('pdf-to-book', 'book', 'home.PDFToBook.title', 'home.PDFToBook.desc', 'PDFToBook.tags', 'convert')}">
       </div>
       <div
-      th:replace="~{fragments/navbarEntry :: navbarEntry ('pdf-to-markdown', 'markdown_copy', 'home.PDFToMarkdown.title', 'home.PDFToMarkdown.desc', 'PDFToMarkdown.tags', 'convert')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry ('pdf-to-markdown', 'markdown_copy', 'home.PDFToMarkdown.title', 'home.PDFToMarkdown.desc', 'PDFToMarkdown.tags', 'convert')}">
-         </div>
+      </div>
 
     </div>
+  </div>
+  <div id="convertGroup" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
     </div>
-    <div id="convertGroup"  class="feature-group">
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertTo})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('img-to-pdf', 'picture_as_pdf', 'home.imageToPdf.title', 'home.imageToPdf.desc', 'imageToPdf.tags', 'convertto')}">
       </div>
       <div
@@ -126,12 +123,11 @@
       <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('book-to-pdf', 'book', 'home.BookToPDF.title', 'home.BookToPDF.desc', 'BookToPDF.tags', 'convertto')}">
       </div>
-      </div>
+    </div>
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
+    </div>
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.convertFrom})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('pdf-to-img', 'photo_library', 'home.pdfToImage.title', 'home.pdfToImage.desc', 'pdfToImage.tags', 'convert')}">
       </div>
       <div
@@ -159,13 +155,12 @@
         th:replace="~{fragments/navbarEntry :: navbarEntry('pdf-to-book', 'book', 'home.PDFToBook.title', 'home.PDFToBook.desc', 'PDFToBook.tags', 'convert')}">
       </div>
     </div>
+  </div>
+  <div id="groupSecurity" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.security})}">
     </div>
-    <div id="groupSecurity" class="feature-group">
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.security})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('add-password', 'lock', 'home.addPassword.title', 'home.addPassword.desc', 'addPassword.tags', 'security')}">
       </div>
       <div
@@ -182,34 +177,34 @@
       </div>
 
       <div
-      th:replace="~{fragments/navbarEntry :: navbarEntry('validate-signature', 'verified', 'home.validateSignature.title', 'home.validateSignature.desc', 'validateSignature.tags', 'security')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('validate-signature', 'verified', 'home.validateSignature.title', 'home.validateSignature.desc', 'validateSignature.tags', 'security')}">
-    </div>
+      </div>
-  <div
+      <div
-  th:replace="~{fragments/navbarEntry :: navbarEntry('remove-cert-sign', 'remove_moderator', 'home.removeCertSign.title', 'home.removeCertSign.desc', 'removeCertSign.tags', 'security')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('remove-cert-sign', 'remove_moderator', 'home.removeCertSign.title', 'home.removeCertSign.desc', 'removeCertSign.tags', 'security')}">
-</div>
+      </div>
-<div
+      <div
-  th:replace="~{fragments/navbarEntry :: navbarEntry('sanitize-pdf', 'sanitizer', 'home.sanitizePdf.title', 'home.sanitizePdf.desc', 'sanitizePdf.tags', 'security')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('sanitize-pdf', 'sanitizer', 'home.sanitizePdf.title', 'home.sanitizePdf.desc', 'sanitizePdf.tags', 'security')}">
-</div>
+      </div>
-<div
+      <div
-  th:replace="~{fragments/navbarEntryCustom :: navbarEntry('auto-redact', '/images/redact-auto.svg#icon-redact-auto', 'home.autoRedact.title', 'home.autoRedact.desc', 'autoRedact.tags', 'security')}">
+        th:replace="~{fragments/navbarEntryCustom :: navbarEntry('auto-redact', '/images/redact-auto.svg#icon-redact-auto', 'home.autoRedact.title', 'home.autoRedact.desc', 'autoRedact.tags', 'security')}">
-</div>
+      </div>
-<div
+      <div
-th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/redact-manual.svg#icon-redact-manual', 'home.redact.title', 'home.redact.desc', 'redact.tags', 'security')}">
+        th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/redact-manual.svg#icon-redact-manual', 'home.redact.title', 'home.redact.desc', 'redact.tags', 'security')}">
-</div>
+      </div>
-<div
+      <div
-  th:replace="~{fragments/navbarEntry :: navbarEntry('stamp', 'approval', 'home.AddStampRequest.title', 'home.AddStampRequest.desc', 'AddStampRequest.tags', 'security')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('stamp', 'approval', 'home.AddStampRequest.title', 'home.AddStampRequest.desc', 'AddStampRequest.tags', 'security')}">
-</div>
+      </div>
-<div
+      <div
-  th:replace="~{fragments/navbarEntry :: navbarEntry('add-watermark', 'water_drop', 'home.watermark.title', 'home.watermark.desc', 'watermark.tags', 'security')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('add-watermark', 'water_drop', 'home.watermark.title', 'home.watermark.desc', 'watermark.tags', 'security')}">
-</div>
       </div>
     </div>
+  </div>
 
-    <div id="groupView" class="feature-group">
+  <div id="groupView" class="feature-group">
-      <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
-      </div>
+    </div>
-      <div class="nav-group-container">
+    <div class="nav-group-container">
-        <div
+      <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('view-pdf', 'menu_book', 'home.viewPdf.title', 'home.viewPdf.desc', 'viewPdf.tags', 'other')}">
       </div>
       <div
@@ -246,16 +241,15 @@ th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/reda
         th:replace="~{fragments/navbarEntry :: navbarEntry('remove-image-pdf', 'remove_selection', 'home.removeImagePdf.title', 'home.removeImagePdf.desc', 'removeImagePdf.tags', 'other')}">
       </div>
       <div
-        th:replace="~{fragments/navbarEntry :: navbarEntry('replace-color-pdf', 'format_color_fill', 'home.replaceColorPdf.title', 'home.replaceColorPdf.desc', 'replaceColorPdf.tags', 'other')}">
+        th:replace="~{fragments/navbarEntry :: navbarEntry('replace-and-invert-color-pdf', 'format_color_fill', 'home.replaceColorPdf.title', 'home.replaceColorPdf.desc', 'replaceColorPdf.tags', 'other')}">
-      </div>
       </div>
     </div>
-    <div id="groupAdvanced" class="feature-group">
+  </div>
+  <div id="groupAdvanced" class="feature-group">
+    <div th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.advance})}">
+    </div>
+    <div class="nav-group-container">
       <div
-        th:replace="~{fragments/featureGroupHeader :: featureGroupHeader(groupTitle=#{navbar.sections.advance})}">
-      </div>
-      <div class="nav-group-container">
-        <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('pipeline', 'family_history', 'home.pipeline.title', 'home.pipeline.desc', 'pipeline.tags', 'advance')}">
       </div>
       <div
@@ -291,6 +285,6 @@ th:replace="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/reda
       <div
         th:replace="~{fragments/navbarEntryCustom :: navbarEntry('split-pdf-by-chapters', '/images/split-chapters.svg#icon-split-chapters', 'home.splitPdfByChapters.title', 'home.splitPdfByChapters.desc', 'splitPdfByChapters.tags', 'advance')}">
       </div>
-      </div>
+    </div>
   </div>
-  </th:block>
+</th:block>

src/main/resources/templates/home-legacy.html

@@ -27,15 +27,16 @@
         <span class="material-symbols-rounded search-icon">
           search
         </span>
-        <input type="text" id="searchBar" onkeyup="filterCards()" th:placeholder="#{home.searchBar}" autofocus>
+        <input type="text" id="searchBar" onkeyup="filterCardsLegacy()" th:placeholder="#{home.searchBar}" autofocus>
         <div style="display: flex; align-items: center;">
-        <a href="home" onclick="setAsDefault('home')" style="text-decoration: none; color: inherit; cursor: pointer; display: flex; align-items: center;">
+          <a href="home" onclick="setAsDefault('home')"
-          <span th:text="#{home.newHomePage}">
+            style="text-decoration: none; color: inherit; cursor: pointer; display: flex; align-items: center;">
-          </span>
+            <span th:text="#{home.newHomePage}">
-        <span class="material-symbols-rounded toggle-favourites"  style="font-size: 2rem; margin-left: 0.2rem;" >
+            </span>
-          home
+            <span class="material-symbols-rounded toggle-favourites" style="font-size: 2rem; margin-left: 0.2rem;">
-        </span>
+              home
-        </a>
+            </span>
+          </a>
         </div>
         <div id="filtersContainer">
           <span class="material-symbols-rounded filter-button" onclick="toggleFavoritesOnly()">
@@ -70,7 +71,8 @@
           </div>
 
           <div id="groupFavorites" class="feature-group-legacy">
-            <div th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.favorite})}">
+            <div
+              th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.favorite})}">
             </div>
             <div class="feature-group-container">
             </div>
@@ -248,7 +250,8 @@
           </div>
 
           <div id="groupView" class="feature-group-legacy">
-            <div th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
+            <div
+              th:replace="~{fragments/featureGroupHeaderLegacy :: featureGroupHeader(groupTitle=#{navbar.sections.edit})}">
             </div>
             <div class="feature-group-container">
               <div
@@ -289,7 +292,7 @@
                 th:replace="~{fragments/card :: card(id='remove-image-pdf', cardTitle=#{home.removeImagePdf.title}, cardText=#{home.removeImagePdf.desc}, cardLink='remove-image-pdf', toolIcon='remove_selection', tags=#{removeImagePdf.tags}, toolGroup='other')}">
               </div>
               <div
-                th:replace="~{fragments/card :: card(id='replace-color-pdf', cardTitle=#{home.replaceColorPdf.title}, cardText=#{home.replaceColorPdf.desc}, cardLink='replace-and-invert-color-pdf', toolIcon='format_color_fill', tags=#{replaceColorPdf.tags}, toolGroup='other')}">
+                th:replace="~{fragments/card :: card(id='replace-and-invert-color-pdf', cardTitle=#{home.replaceColorPdf.title}, cardText=#{home.replaceColorPdf.desc}, cardLink='replace-and-invert-color-pdf', toolIcon='format_color_fill', tags=#{replaceColorPdf.tags}, toolGroup='other')}">
               </div>
 
             </div>
@@ -513,7 +516,7 @@
     function setAsDefault(value) {
       localStorage.setItem('defaultView', value);
       console.log(`Default view set to: ${value}`);
-      }
+    }
   </script>
 
 

testing/test.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Default value for the Boolean parameter
-VERIFICATION=${1:-false}  # Default is "false" if no parameter is passed
-
 # Find project root by locating build.gradle
 find_root() {
     local dir="$PWD"
@@ -26,18 +23,18 @@ check_health() {
     local end=$((SECONDS+60))
 
     echo -n "Waiting for $service_name to become healthy..."
-	until [ "$(docker inspect --format='{{json .State.Health.Status}}' "$service_name")" == '"healthy"' ] || [ $SECONDS -ge $end ]; do
+    until [ "$(docker inspect --format='{{json .State.Health.Status}}' "$service_name")" == '"healthy"' ] || [ $SECONDS -ge $end ]; do
-		sleep 3
+        sleep 3
-		echo -n "."
+        echo -n "."
-		if [ $SECONDS -ge $end ]; then
+        if [ $SECONDS -ge $end ]; then
-			echo -e "\n$service_name health check timed out after 80 seconds."
+            echo -e "\n$service_name health check timed out after 80 seconds."
-			echo "Printing logs for $service_name:"
+            echo "Printing logs for $service_name:"
             docker logs "$service_name"
-			return 1
+            return 1
-		fi
+        fi
-	done
+    done
-	echo -e "\n$service_name is healthy!"
+    echo -e "\n$service_name is healthy!"
-	echo "Printing logs for $service_name:"
+    echo "Printing logs for $service_name:"
     docker logs "$service_name"
     return 0
 }
@@ -81,10 +78,10 @@ run_tests() {
 
 # Main testing routine
 main() {
-	SECONDS=0
+    SECONDS=0
 
     cd "$PROJECT_ROOT"
-   
+
     export DOCKER_ENABLE_SECURITY=false
     # Run the gradlew build command and check if it fails
     if ! ./gradlew clean build; then
@@ -92,28 +89,26 @@ main() {
         exit 1
     fi
 
-
     # Building Docker images
     # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
     docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
-	
+
     # Test each configuration
     run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml"
-	
-	echo "Testing webpage accessibility..."
-	cd "testing"
-	if ./test_webpages.sh -f webpage_urls.txt -b http://localhost:8080; then
-		passed_tests+=("Webpage-Accessibility-lite")
-	else
-		failed_tests+=("Webpage-Accessibility-lite")
-		echo "Webpage accessibility lite tests failed"
-	fi
-	cd "$PROJECT_ROOT"
-	docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" down
-	
 
-    #run_tests "Stirling-PDF" "./exampleYmlFiles/docker-compose-latest.yml"
+    echo "Testing webpage accessibility..."
-	#docker-compose -f "./exampleYmlFiles/docker-compose-latest.yml" down
+    cd "testing"
+    if ./test_webpages.sh -f webpage_urls.txt -b http://localhost:8080; then
+        passed_tests+=("Webpage-Accessibility-lite")
+    else
+        failed_tests+=("Webpage-Accessibility-lite")
+        echo "Webpage accessibility lite tests failed"
+    fi
+    cd "$PROJECT_ROOT"
+    docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" down
+
+    # run_tests "Stirling-PDF" "./exampleYmlFiles/docker-compose-latest.yml"
+    # docker-compose -f "./exampleYmlFiles/docker-compose-latest.yml" down
 
     export DOCKER_ENABLE_SECURITY=true
     # Run the gradlew build command and check if it fails
@@ -122,72 +117,68 @@ main() {
         exit 1
     fi
 
-
     # Building Docker images with security enabled
-   # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
+    # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
- #   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
+    # docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .
     docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .
-    
+
-    
+
     # Test each configuration with security
-  #  run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml"
+    # run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml"
-	#docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" down
+    # docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" down
-  #  run_tests "Stirling-PDF-Security" "./exampleYmlFiles/docker-compose-latest-security.yml"
+    # run_tests "Stirling-PDF-Security" "./exampleYmlFiles/docker-compose-latest-security.yml"
-#	docker-compose -f "./exampleYmlFiles/docker-compose-latest-security.yml" down
+    # docker-compose -f "./exampleYmlFiles/docker-compose-latest-security.yml" down
 
 
-	run_tests "Stirling-PDF-Security-Fat" "./exampleYmlFiles/docker-compose-latest-fat-security.yml"
+    run_tests "Stirling-PDF-Security-Fat" "./exampleYmlFiles/docker-compose-latest-fat-security.yml"
-	
-	echo "Testing webpage accessibility..."
-	cd "testing"
-	if ./test_webpages.sh -f webpage_urls_full.txt -b http://localhost:8080; then
-		passed_tests+=("Webpage-Accessibility-full")
-	else
-		failed_tests+=("Webpage-Accessibility-full")
-		echo "Webpage accessibility full tests failed"
-	fi
-	cd "$PROJECT_ROOT"
-	
-	docker-compose -f "./exampleYmlFiles/docker-compose-latest-fat-security.yml" down
 
+    echo "Testing webpage accessibility..."
+    cd "testing"
+    if ./test_webpages.sh -f webpage_urls_full.txt -b http://localhost:8080; then
+        passed_tests+=("Webpage-Accessibility-full")
+    else
+        failed_tests+=("Webpage-Accessibility-full")
+        echo "Webpage accessibility full tests failed"
+    fi
+    cd "$PROJECT_ROOT"
 
-	run_tests "Stirling-PDF-Security-Fat-with-login" "./exampleYmlFiles/test_cicd.yml"
+    docker-compose -f "./exampleYmlFiles/docker-compose-latest-fat-security.yml" down
+
+    run_tests "Stirling-PDF-Security-Fat-with-login" "./exampleYmlFiles/test_cicd.yml"
+
+    if [ $? -eq 0 ]; then
+        cd "testing/cucumber"
+        if python -m behave; then
+            passed_tests+=("Stirling-PDF-Regression")
+        else
+            failed_tests+=("Stirling-PDF-Regression")
+            echo "Printing docker logs of failed regression"
+            docker logs "Stirling-PDF-Security-Fat-with-login"
+            echo "Printed docker logs of failed regression"
+        fi
+        cd "$PROJECT_ROOT"
+    fi
+
+    docker-compose -f "./exampleYmlFiles/test_cicd.yml" down
 
-	if [ $? -eq 0 ]; then
-		cd "testing/cucumber"
-		if python -m behave; then
-			passed_tests+=("Stirling-PDF-Regression")
-		else
-			failed_tests+=("Stirling-PDF-Regression")
-			echo "Printing docker logs of failed regression"
-			docker logs "Stirling-PDF-Security-Fat-with-login"
-			echo "Printed docker logs of failed regression"
-		fi
-		cd "$PROJECT_ROOT"
-	fi
-	
-	docker-compose -f "./exampleYmlFiles/test_cicd.yml" down
-	
     # Report results
     echo "All tests completed in $SECONDS seconds."
 
 
-	if [ ${#passed_tests[@]} -ne 0 ]; then
+    if [ ${#passed_tests[@]} -ne 0 ]; then
-		echo "Passed tests:"
+        echo "Passed tests:"
-	fi
+    fi
     for test in "${passed_tests[@]}"; do
         echo -e "\e[32m$test\e[0m"  # Green color for passed tests
     done
 
-	if [ ${#failed_tests[@]} -ne 0 ]; then
+    if [ ${#failed_tests[@]} -ne 0 ]; then
-		echo "Failed tests:"
+        echo "Failed tests:"
-	fi
+    fi
     for test in "${failed_tests[@]}"; do
         echo -e "\e[31m$test\e[0m"  # Red color for failed tests
     done
 
-
-
     # Check if there are any failed tests and exit with an error code if so
     if [ ${#failed_tests[@]} -ne 0 ]; then
         echo "Some tests failed."
@@ -196,7 +187,6 @@ main() {
         echo "All tests passed successfully."
         exit 0
     fi
-
 }
 
-main
+main