Merge pull request #1287 from Ludy87/add_oauth2

add: multi OAuth2 option README.md, small cosmetic repairs

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you would like to add or modify a translation, please see [How to add new lan
 
 ## Docs
 
-Documentation for Stirling-PDF is handled in a seperate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
+Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
 
 ## Fixing Bugs or Adding a New Feature
 

README.md

@@ -159,7 +159,7 @@ Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR
 
 ## Supported Languages
 
-Stirling PDF currently supports 27!
+Stirling PDF currently supports 28!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
@@ -191,6 +191,7 @@ Stirling PDF currently supports 27!
 | Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![81%](https://geps.dev/progress/81)   |
 | Ukrainian (Українська) (uk_UA)              | ![87%](https://geps.dev/progress/87)   |
 | Slovakian (Slovensky) (sk_SK)               | ![96%](https://geps.dev/progress/96)   |
+| Czech (Česky) (cs_CZ)                       | ![96%](https://geps.dev/progress/96)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -226,7 +227,7 @@ security:
   loginAttemptCount: 5 # lock user account after 5 tries
   loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
 #  initialLogin:
-#    username: "admin" # Initial username for the first login (these are defaulted)
+#    username: "admin" # Initial username for the first login
 #    password: "stirling" # Initial password for the first login
 #  oauth2:
 #    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
@@ -237,6 +238,23 @@ security:
 #    useAsUsername: "email" # Default is 'email'; custom fields can be used as the username
 #    scopes: "openid, profile, email" # Specify the scopes for which the application will request permissions
 #    provider: "google" # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
+#    client:
+#      google:
+#        clientId: "" # Client ID for Google OAuth2
+#        clientSecret: "" # Client Secret for Google OAuth2
+#        scopes: "https://www.googleapis.com/auth/userinfo.email, https://www.googleapis.com/auth/userinfo.profile" # Scopes for Google OAuth2
+#        useAsUsername: "email" # Field to use as the username for Google OAuth2
+#      github:
+#        clientId: "" # Client ID for GitHub OAuth2
+#        clientSecret: "" # Client Secret for GitHub OAuth2
+#        scopes: "read:user" # Scope for GitHub OAuth2
+#        useAsUsername: "login" # Field to use as the username for GitHub OAuth2
+#      keycloak:
+#        issuer: "http://192.168.0.123:8888/realms/stirling-pdf" # URL of the Keycloak realm's OpenID Connect Discovery endpoint
+#        clientId: "stirling-pdf" # Client ID for Keycloak OAuth2
+#        clientSecret: "" # Client Secret for Keycloak OAuth2
+#        scopes: "openid, profile, email" # Scopes for Keycloak OAuth2
+#        useAsUsername: "email" # Field to use as the username for Keycloak OAuth2
 
 system:
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)

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

@@ -66,8 +66,7 @@ public class ConvertImgPDFController {
                         Integer.valueOf(dpi),
                         filename);
 
-
+        if (result == null || result.length == 0) {
-        if(result == null || result.length == 0) {
             logger.error("resultant bytes for {} is null, error converting ", filename);
         }
         if (singleImage) {

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -750,9 +750,6 @@ public class ApplicationProperties {
             this.googlevisibility = googlevisibility;
         }
 
-      
-
-
         @Override
         public String toString() {
             return "System [defaultLocale="

src/main/resources/static/js/languageSelection.js

@@ -61,7 +61,7 @@ function handleDropdownItemClick(event) {
 
 document.addEventListener("DOMContentLoaded", function () {
 
-document.querySelectorAll(".col-lg-2.col-sm-6").forEach((element) => {
+  document.querySelectorAll(".col-lg-2.col-sm-6").forEach((element) => {
       const dropdownItems = element.querySelectorAll(".dropdown-item");
       const items = Array.from(dropdownItems).filter(item => !item.querySelector("hr.dropdown-divider"));
 
@@ -75,7 +75,7 @@ document.querySelectorAll(".col-lg-2.col-sm-6").forEach((element) => {
           }
           element.remove();
       }
-});
+  });
 
   //Sort languages by alphabet
   const list = Array.from(document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').children).filter(

src/main/resources/static/js/search.js

@@ -40,7 +40,6 @@ document.querySelector("#navbarSearchInput").addEventListener("input", function
     var itemHref = item.getAttribute("href");
     var tags = item.getAttribute("data-bs-tags") || ""; // If no tags, default to empty string
 
-	
       if (titleElement && iconElement && itemHref !== "#") {
         var title = titleElement.innerText;
         if (

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

@@ -233,7 +233,6 @@
 
           </li>
 
-
           <li class="nav-item">
             <a class="nav-link" href="#" th:href="@{multi-tool}"
               th:classappend="${currentPage}=='multi-tool' ? 'active' : ''" th:title="#{home.multiTool.desc}">
@@ -254,7 +253,6 @@
             </a>
           </li>
 
-
           <li class="nav-item">
             <a class="nav-link" href="#" title="#{home.compressPdfs.title}" th:href="@{compress-pdf}"
               th:classappend="${currentPage}=='compress-pdf' ? 'active' : ''" th:title="#{home.compressPdfs.desc}">
@@ -276,8 +274,7 @@
             </a>
           </li>
 
-<!--
+          <!-- <li class="nav-item">
-          <li class="nav-item">
             <a class="nav-link" href="#" th:href="@{merge-pdfs}"
               th:classappend="${currentPage}=='merge-pdfs' ? 'active' : ''" th:title="#{home.merge.desc}">
               <span class="material-symbols-rounded">
@@ -285,8 +282,8 @@
               </span>
               <span class="icon-text" th:data-text="#{home.merge.title}" th:text="#{home.merge.title}"></span>
             </a>
-          </li>
+          </li> -->
--->
+
         </ul>
         <ul class="navbar-nav  flex-nowrap">
           <li class="nav-item dropdown">
@@ -346,8 +343,6 @@
             </div>
           </li>
 
-
-
           <li class="nav-item">
             <!-- Settings Button -->
             <a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#settingsModal">
@@ -405,9 +400,6 @@
               target="_blank"></a>
           </div>
 
-
-
-
           <div class="mb-3">
             <label for="downloadOption" th:utext="#{settings.downloadOption.title}"></label>
             <select class="form-control" id="downloadOption">