From 994bb4d1d23ce16a5c0e3a16c86b1219c4ab9c49 Mon Sep 17 00:00:00 2001 From: NeilJared Date: Wed, 14 Feb 2024 11:57:34 +0100 Subject: [PATCH 001/200] Update messages_es_ES.properties Minor bug fixes: es_ES translation --- src/main/resources/messages_es_ES.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 43061780..3a303d9e 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -57,7 +57,7 @@ usernameExistsMessage=El nuevo nombre de usuario está en uso. ############### # Pipeline # ############### -pipeline.header=Menu Pipeline (Alfa) +pipeline.header=Menú de canalización (Alfa) pipeline.uploadButton=Cargar personalización pipeline.configureButton=Configurar pipeline.defaultOption=Personalizar @@ -66,13 +66,13 @@ pipeline.submitButton=Enviar ###################### # Pipeline Options # ###################### -pipelineOptions.header=Configuración Pipeline -pipelineOptions.pipelineNameLabel=Nombre del Pipeline -pipelineOptions.saveSettings=Guardar configuración de la oiperación -pipelineOptions.pipelineNamePrompt=Introduzca aquí el nombre del pipeline +pipelineOptions.header=Configuración de la canalización +pipelineOptions.pipelineNameLabel=Nombre de la canalización +pipelineOptions.saveSettings=Guardar configuración de la canalización +pipelineOptions.pipelineNamePrompt=Introduzca aquí el nombre de la canalización pipelineOptions.selectOperation=Seleccione la operación pipelineOptions.addOperationButton=Añadir operación -pipelineOptions.pipelineHeader=Pipeline: +pipelineOptions.pipelineHeader=Canalización: pipelineOptions.saveButton=Descargar pipelineOptions.validateButton=Validar @@ -563,7 +563,7 @@ autoSplitPDF.submit=Entregar #pipeline -pipeline.title=Pipeline +pipeline.title=Canalización #pageLayout From 639aed71203c89bdf391056815acd3d18319ad89 Mon Sep 17 00:00:00 2001 From: NeilJared Date: Wed, 14 Feb 2024 12:22:47 +0100 Subject: [PATCH 002/200] Update messages_es_ES.properties Updated es_ES translation --- src/main/resources/messages_es_ES.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 3a303d9e..38c6d6a5 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -11,7 +11,7 @@ imgPrompt=Seleccionar Imagen(es) genericSubmit=Enviar processTimeWarning=Advertencia: este proceso puede tardar hasta un minuto dependiendo del tamaño del archivo pageOrderPrompt=Orden de páginas (Introduzca una lista de números de página separados por coma): -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=Selección de página personalizada (Intruduzca una lista de números de página separados por comas 1,5,6 o funciones como 2n+1) : goToPage=Ir a true=Verdadero false=Falso From e4a76e96af4fd2bedb1bced2b6cb05b7fe580887 Mon Sep 17 00:00:00 2001 From: Ludy Date: Fri, 16 Feb 2024 22:49:06 +0100 Subject: [PATCH 003/200] HTML, CSS, JS and JAVA corrections (#810) * CSS corrections * HTML corrections * JS corrections * JAVA corrections * remove tab * CSS corrections 2 * JS corrections 2 * back to the roots * max-linie 127 * add slash hr|br * return bootstrap-icons.css * return bootstrap-icons.min.css * return bootstrap.min.css * Update bootstrap-icons.css * Update bootstrap-icons.min.css * Update bootstrap-icons.min.css * Update bootstrap.min.css * CSS corrections * HTML corrections * JS corrections * JAVA corrections * remove tab * CSS corrections 2 * JS corrections 2 * back to the roots * max-linie 127 * add slash hr|br * return bootstrap-icons.css * Update bootstrap-icons.css * Bootstrap CSS * Update prism.css --- .../controller/web/AccountWebController.java | 3 + src/main/resources/static/css/account.css | 4 + src/main/resources/static/css/add-image.css | 28 + src/main/resources/static/css/dark-mode.css | 122 +- src/main/resources/static/css/dragdrop.css | 80 +- src/main/resources/static/css/error.css | 88 ++ src/main/resources/static/css/errorBanner.css | 109 +- src/main/resources/static/css/fileSelect.css | 12 +- src/main/resources/static/css/footer.css | 20 + src/main/resources/static/css/game.css | 67 +- src/main/resources/static/css/general.css | 80 +- src/main/resources/static/css/home.css | 98 +- .../resources/static/css/imageHighlighter.css | 57 +- src/main/resources/static/css/licenses.css | 9 + src/main/resources/static/css/light-mode.css | 11 +- src/main/resources/static/css/login.css | 111 ++ src/main/resources/static/css/merge.css | 3 +- src/main/resources/static/css/multi-tool.css | 119 ++ src/main/resources/static/css/navbar.css | 118 +- src/main/resources/static/css/pdfActions.css | 84 +- src/main/resources/static/css/pipeline.css | 21 + .../resources/static/css/rainbow-mode.css | 106 +- src/main/resources/static/css/rotate-pdf.css | 29 + src/main/resources/static/css/sign.css | 39 + .../static/css/split-pdf-by-sections.css | 10 + src/main/resources/static/css/stamp.css | 41 + .../resources/static/css/tab-container.css | 28 +- src/main/resources/static/js/darkmode.js | 86 +- src/main/resources/static/js/downloader.js | 383 +++--- .../resources/static/js/draggable-utils.js | 499 ++++---- src/main/resources/static/js/errorBanner.js | 72 +- src/main/resources/static/js/favourites.js | 74 +- src/main/resources/static/js/fileInput.js | 177 +-- src/main/resources/static/js/game.js | 513 ++++---- src/main/resources/static/js/githubVersion.js | 79 +- src/main/resources/static/js/homecard.js | 122 +- .../resources/static/js/languageSelection.js | 130 +- .../static/js/local-pdf-input-download.js | 78 +- src/main/resources/static/js/merge.js | 178 +-- .../static/js/multitool/DragDropManager.js | 204 ++-- .../static/js/multitool/ImageHighlighter.js | 74 +- .../static/js/multitool/PdfActionsManager.js | 290 ++--- .../static/js/multitool/PdfContainer.js | 515 ++++---- .../static/js/multitool/fileInput.js | 159 +-- .../static/js/multitool/horizontalScroll.js | 51 +- src/main/resources/static/js/pipeline.js | 1066 ++++++++--------- src/main/resources/static/js/search.js | 117 +- src/main/resources/static/js/settings.js | 57 +- src/main/resources/static/js/tab-container.js | 61 +- .../resources/static/pdfjs/css/viewer.css | 503 +++++--- src/main/resources/templates/about.html | 33 +- src/main/resources/templates/account.html | 594 +++++---- src/main/resources/templates/addUsers.html | 140 ++- .../resources/templates/auto-split-pdf.html | 69 +- .../resources/templates/change-creds.html | 153 ++- .../templates/convert/book-to-pdf.html | 44 +- .../templates/convert/file-to-pdf.html | 55 +- .../templates/convert/html-to-pdf.html | 53 +- .../templates/convert/img-to-pdf.html | 152 ++- .../templates/convert/markdown-to-pdf.html | 45 +- .../templates/convert/pdf-to-book.html | 96 +- .../templates/convert/pdf-to-csv.html | 284 +++-- .../templates/convert/pdf-to-html.html | 43 +- .../templates/convert/pdf-to-img.html | 101 +- .../templates/convert/pdf-to-pdfa.html | 47 +- .../convert/pdf-to-presentation.html | 58 +- .../templates/convert/pdf-to-text.html | 59 +- .../templates/convert/pdf-to-word.html | 58 +- .../templates/convert/pdf-to-xml.html | 43 +- .../templates/convert/url-to-pdf.html | 43 +- src/main/resources/templates/crop.html | 270 ++--- src/main/resources/templates/error.html | 148 +-- .../resources/templates/extract-page.html | 50 +- .../resources/templates/fragments/card.html | 24 +- .../resources/templates/fragments/common.html | 241 ++-- .../templates/fragments/errorBanner.html | 28 +- .../fragments/errorBannerPerPage.html | 101 +- .../resources/templates/fragments/footer.html | 69 +- .../templates/fragments/languages.html | 131 +- .../resources/templates/fragments/navbar.html | 502 ++++---- .../templates/fragments/navbarEntry.html | 12 +- src/main/resources/templates/home.html | 171 ++- src/main/resources/templates/licenses.html | 90 +- src/main/resources/templates/login.html | 448 +++---- src/main/resources/templates/merge-pdfs.html | 63 +- .../resources/templates/misc/add-image.html | 227 ++-- .../templates/misc/add-page-numbers.html | 269 ++--- .../templates/misc/adjust-contrast.html | 439 ++++--- .../resources/templates/misc/auto-crop.html | 45 +- .../resources/templates/misc/auto-rename.html | 43 +- .../templates/misc/change-metadata.html | 472 ++++---- .../resources/templates/misc/compare.html | 363 +++--- .../templates/misc/compress-pdf.html | 78 +- .../templates/misc/extract-image-scans.html | 91 +- .../templates/misc/extract-images.html | 49 +- .../resources/templates/misc/flatten.html | 94 +- .../resources/templates/misc/ocr-pdf.html | 477 ++++---- .../templates/misc/remove-annotations.html | 81 +- .../templates/misc/remove-blanks.html | 61 +- src/main/resources/templates/misc/repair.html | 42 +- .../templates/misc/show-javascript.html | 171 ++- src/main/resources/templates/misc/stamp.html | 361 +++--- .../templates/multi-page-layout.html | 68 +- src/main/resources/templates/multi-tool.html | 305 ++--- src/main/resources/templates/overlay-pdf.html | 178 ++- .../resources/templates/pdf-organizer.html | 95 +- .../templates/pdf-to-single-page.html | 41 +- src/main/resources/templates/pipeline.html | 369 +++--- .../resources/templates/remove-pages.html | 59 +- src/main/resources/templates/rotate-pdf.html | 184 ++- src/main/resources/templates/scale-pages.html | 76 +- .../templates/security/add-password.html | 155 ++- .../templates/security/add-watermark.html | 268 ++--- .../templates/security/auto-redact.html | 137 ++- .../templates/security/cert-sign.html | 199 ++- .../security/change-permissions.html | 124 +- .../templates/security/get-info-on-pdf.html | 283 +++-- .../templates/security/remove-password.html | 58 +- .../templates/security/remove-watermark.html | 56 +- .../templates/security/sanitize-pdf.html | 89 +- src/main/resources/templates/sign.html | 561 ++++----- .../templates/split-by-size-or-count.html | 65 +- .../templates/split-pdf-by-sections.html | 148 +-- src/main/resources/templates/split-pdfs.html | 65 +- 124 files changed, 9025 insertions(+), 9424 deletions(-) create mode 100644 src/main/resources/static/css/account.css create mode 100644 src/main/resources/static/css/add-image.css create mode 100644 src/main/resources/static/css/error.css create mode 100644 src/main/resources/static/css/footer.css create mode 100644 src/main/resources/static/css/licenses.css create mode 100644 src/main/resources/static/css/login.css create mode 100644 src/main/resources/static/css/multi-tool.css create mode 100644 src/main/resources/static/css/pipeline.css create mode 100644 src/main/resources/static/css/rotate-pdf.css create mode 100644 src/main/resources/static/css/sign.css create mode 100644 src/main/resources/static/css/split-pdf-by-sections.css create mode 100644 src/main/resources/static/css/stamp.css diff --git a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java index 614dd8a0..a5b3d79e 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java @@ -33,6 +33,8 @@ public class AccountWebController { return "redirect:/"; } + model.addAttribute("currentPage", "login"); + if (request.getParameter("error") != null) { model.addAttribute("error", request.getParameter("error")); @@ -112,6 +114,7 @@ public class AccountWebController { model.addAttribute("role", user.get().getRolesAsString()); model.addAttribute("settings", settingsJson); model.addAttribute("changeCredsFlag", user.get().isFirstLogin()); + model.addAttribute("currentPage", "account"); } } else { return "redirect:/"; diff --git a/src/main/resources/static/css/account.css b/src/main/resources/static/css/account.css new file mode 100644 index 00000000..957fcd9f --- /dev/null +++ b/src/main/resources/static/css/account.css @@ -0,0 +1,4 @@ +.buttons-container { + margin-top: 20px; + text-align: center; +} diff --git a/src/main/resources/static/css/add-image.css b/src/main/resources/static/css/add-image.css new file mode 100644 index 00000000..5a735b42 --- /dev/null +++ b/src/main/resources/static/css/add-image.css @@ -0,0 +1,28 @@ +#box-drag-container { + position: relative; + margin: 20px 0; +} +#pdf-canvas { + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); + width: 100%; +} +.draggable-buttons-box { + position: absolute; + top: 0; + padding: 10px; + width: 100%; + display: flex; + gap: 5px; +} +.draggable-buttons-box > button { + z-index: 10; + background-color: rgba(13, 110, 253, 0.1); +} +.draggable-canvas { + border: 1px solid red; + position: absolute; + touch-action: none; + user-select: none; + top: 0px; + left: 0; +} diff --git a/src/main/resources/static/css/dark-mode.css b/src/main/resources/static/css/dark-mode.css index 6f914fc3..8ddbf052 100644 --- a/src/main/resources/static/css/dark-mode.css +++ b/src/main/resources/static/css/dark-mode.css @@ -1,9 +1,11 @@ /* Dark Mode Styles */ -body, select, textarea { - --body-background-color: 51, 51, 51; - --base-font-color: 255, 255, 255; - background-color: rgb(var(--body-background-color)) !important; - color: rgb(var(--base-font-color)) !important; +body, +select, +textarea { + --body-background-color: 51, 51, 51; + --base-font-color: 255, 255, 255; + background-color: rgb(var(--body-background-color)) !important; + color: rgb(var(--base-font-color)) !important; } .card { background-color: rgb(var(--body-background-color)) !important; @@ -11,11 +13,11 @@ body, select, textarea { color: rgb(var(--base-font-color)) !important; } - a { - color: #add8e6; - } - a:hover { - color: #87ceeb; /* Slightly brighter blue on hover for accessibility */ +a { + color: #add8e6; +} +a:hover { + color: #87ceeb; /* Slightly brighter blue on hover for accessibility */ } .dark-card { @@ -36,7 +38,7 @@ body, select, textarea { color: rgb(var(--base-font-color)) !important; } #support-section { - background-color: #444 !important; + background-color: #444 !important; } #pages-container-wrapper { @@ -47,89 +49,93 @@ body, select, textarea { } .favorite-icon img { - filter: brightness(0) invert(1) !important; + filter: brightness(0) invert(1) !important; } table thead { - background-color: #333 !important; - border: 1px solid #444; + background-color: #333 !important; + border: 1px solid #444; } -table th, table td { - border: 1px solid #444 !important; - color: white; +table th, +table td { + border: 1px solid #444 !important; + color: white; } .btn { - background-color: #444 !important; - border: none; - color: #fff !important; + background-color: #444 !important; + border: none; + color: #fff !important; } .btn-primary { - background-color: #007bff !important; - border: none; - color: #fff !important; + background-color: #007bff !important; + border: none; + color: #fff !important; } .btn-secondary { - background-color: #6c757d !important; - border: none; - color: #fff !important; + background-color: #6c757d !important; + border: none; + color: #fff !important; } .btn-info { - background-color: #17a2b8 !important; - border: none; - color: #fff !important; + background-color: #17a2b8 !important; + border: none; + color: #fff !important; } .btn-danger { - background-color: #dc3545 !important; - border: none; - color: #fff !important; + background-color: #dc3545 !important; + border: none; + color: #fff !important; } .btn-warning { - background-color: #ffc107 !important; - border: none; - color: #000 !important; + background-color: #ffc107 !important; + border: none; + color: #000 !important; } .btn-outline-secondary { - color: #fff !important; - border-color: #fff; + color: #fff !important; + border-color: #fff; } .btn-outline-secondary:hover { - background-color: #444 !important; - color: #007bff !important; - border-color: #007bff; + background-color: #444 !important; + color: #007bff !important; + border-color: #007bff; } .blackwhite-icon { - filter: brightness(0) invert(1); + filter: brightness(0) invert(1); } hr { - border-color: rgba(255, 255, 255, 0.6); /* semi-transparent white */ - background-color: rgba(255, 255, 255, 0.6); /* for some browsers that might use background instead of border for
*/ + border-color: rgba(255, 255, 255, 0.6); /* semi-transparent white */ + background-color: rgba(255, 255, 255, 0.6); /* for some browsers that might use background instead of border for
*/ } .modal-content { - color: #fff !important; - border-color: #fff; + color: #fff !important; + border-color: #fff; } #global-buttons-container input { - background-color: #323948; - caret-color: #ffffff; - color: #ffffff; + background-color: #323948; + caret-color: #ffffff; + color: #ffffff; } #global-buttons-container input::placeholder { - color: #ffffff; + color: #ffffff; } -#global-buttons-container input:disabled::-webkit-input-placeholder { /* WebKit browsers */ - color: #6E6865; +#global-buttons-container input:disabled::-webkit-input-placeholder { + /* WebKit browsers */ + color: #6e6865; } -#global-buttons-container input:disabled:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ - color: #6E6865; +#global-buttons-container input:disabled:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: #6e6865; } -#global-buttons-container input:disabled::-moz-placeholder { /* Mozilla Firefox 19+ */ - color: #6E6865; +#global-buttons-container input:disabled::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: #6e6865; } -#global-buttons-container input:disabled:-ms-input-placeholder { /* Internet Explorer 10+ */ - color: #6E6865; +#global-buttons-container input:disabled:-ms-input-placeholder { + /* Internet Explorer 10+ */ + color: #6e6865; } - diff --git a/src/main/resources/static/css/dragdrop.css b/src/main/resources/static/css/dragdrop.css index e75a0d06..14c3befe 100644 --- a/src/main/resources/static/css/dragdrop.css +++ b/src/main/resources/static/css/dragdrop.css @@ -1,78 +1,78 @@ #drag-container { - position: fixed; - display:flex; - inset: 0; - pointer-events: none; - z-index: 10000; - visibility: hidden; + position: fixed; + display: flex; + inset: 0; + pointer-events: none; + z-index: 10000; + visibility: hidden; } #drag-container:not(:empty) { - visibility: visible; + visibility: visible; } #drag-container .dragged-img { - position: fixed; - max-width: 200px; - max-height: 200px; - box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.58); - transform-origin: top left; + position: fixed; + max-width: 200px; + max-height: 200px; + box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.58); + transform-origin: top left; } .drag-manager_dragging { - width: 0px; - visibility: hidden; + width: 0px; + visibility: hidden; } .drag-manager_draghover { - width: 375px !important; + width: 375px !important; } .drag-manager_draghover .insert-file-button-container { - display: none !important; + display: none !important; } .drag-manager_draghover .button-container { - visibility: hidden !important; + visibility: hidden !important; } -html[lang-direction=ltr] .drag-manager_draghover img { - left: calc(50% + 62.5px) !important; +html[lang-direction="ltr"] .drag-manager_draghover img { + left: calc(50% + 62.5px) !important; } -html[lang-direction=rtl] .drag-manager_draghover img { - left: 125px +html[lang-direction="rtl"] .drag-manager_draghover img { + left: 125px; } .drag-manager_dragging-container .hide-on-drag { - display: none !important; + display: none !important; } .drag-manager_endpoint { - width: 80px; - height: 100%; - background-color: #FFFFFF10; - transition: width 0.1s; - animation: end-drop-expand .3s ease; - display: flex; - align-items: center; - justify-content: center; + width: 80px; + height: 100%; + background-color: #ffffff10; + transition: width 0.1s; + animation: end-drop-expand 0.3s ease; + display: flex; + align-items: center; + justify-content: center; } .drag-manager_endpoint svg { - width: 50px; - height: 50px; + width: 50px; + height: 50px; } .drag-manager_endpoint.drag-manager_draghover { - width: 150px !important; + width: 150px !important; } @keyframes end-drop-expand { - from { - width: 0; - } - to { - width: 80px; - } -} \ No newline at end of file + from { + width: 0; + } + to { + width: 80px; + } +} diff --git a/src/main/resources/static/css/error.css b/src/main/resources/static/css/error.css new file mode 100644 index 00000000..0477d7e0 --- /dev/null +++ b/src/main/resources/static/css/error.css @@ -0,0 +1,88 @@ +h1 { + text-align: center; + margin-top: 10%; +} + +p { + text-align: center; + margin-top: 2em; +} + +.button:hover { + background-color: #005b7f; +} + +.features-container { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr)); + gap: 25px 30px; +} + +.feature-card { + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; + padding: 1.25rem; + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.feature-card .card-text { + flex: 1; +} + +#support-section { + background-color: #f9f9f9; + padding: 4rem; + margin-top: 1rem; + text-align: center; +} + +#support-section h1 { + margin-top: 0; +} + +#support-section p { + margin-top: 0; +} + +#button-group { + display: flex; + justify-content: center; + flex-wrap: wrap; +} + +#github-button, +#discord-button { + display: inline-block; + padding: 1rem 2rem; + margin: 1rem; + background-color: #008cba; + color: #fff; + font-size: 1.2rem; + text-align: center; + text-decoration: none; + border-radius: 3rem; + transition: all 0.3s ease-in-out; +} + +#github-button:hover, +#discord-button:hover, +#home-button:hover { + background-color: #005b7f; +} + +#home-button { + display: block; + width: 200px; + height: 50px; + margin: 2em auto; + background-color: #008cba; + color: white; + text-align: center; + line-height: 50px; + text-decoration: none; + font-weight: bold; + border-radius: 25px; + transition: all 0.3s ease-in-out; +} diff --git a/src/main/resources/static/css/errorBanner.css b/src/main/resources/static/css/errorBanner.css index 69a940b3..11b111ab 100644 --- a/src/main/resources/static/css/errorBanner.css +++ b/src/main/resources/static/css/errorBanner.css @@ -1,94 +1,97 @@ #errorContainer { - margin: 20px; /* adjust this value as needed */ + margin: 20px; /* adjust this value as needed */ } #helpModalDialog { - width: 90%; - max-width: 800px; + width: 90%; + max-width: 800px; } #helpModal h1 { - text-align: center; - margin-top: 10%; + text-align: center; + margin-top: 10%; } #helpModal p { - text-align: center; - margin-top: 2em; + text-align: center; + margin-top: 2em; } #helpModal .button:hover { - background-color: #005b7f; + background-color: #005b7f; } #helpModal .features-container { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr)); - gap: 25px 30px; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(21rem, 3fr)); + gap: 25px 30px; } #helpModal .feature-card { - border: 1px solid rgba(0, 0, 0, .125); - border-radius: 0.25rem; - padding: 1.25rem; - display: flex; - flex-direction: column; - align-items: flex-start; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; + padding: 1.25rem; + display: flex; + flex-direction: column; + align-items: flex-start; } #helpModal .feature-card .card-text { - flex: 1; + flex: 1; } #support-section { - background-color: #f9f9f9; - padding: 4rem; - margin-top: 1rem; - text-align: center; + background-color: #f9f9f9; + padding: 4rem; + margin-top: 1rem; + text-align: center; } #support-section h1 { - margin-top: 0; + margin-top: 0; } #support-section p { - margin-top: 0; + margin-top: 0; } #button-group { - display: flex; - justify-content: center; - flex-wrap: wrap; + display: flex; + justify-content: center; + flex-wrap: wrap; } -#github-button, #discord-button { - display: inline-block; - padding: 1rem 2rem; - margin: 1rem; - background-color: #008CBA; - color: #fff; - font-size: 1.2rem; - text-align: center; - text-decoration: none; - border-radius: 3rem; - transition: all 0.3s ease-in-out; +#github-button, +#discord-button { + display: inline-block; + padding: 1rem 2rem; + margin: 1rem; + background-color: #008cba; + color: #fff; + font-size: 1.2rem; + text-align: center; + text-decoration: none; + border-radius: 3rem; + transition: all 0.3s ease-in-out; } -#github-button:hover, #discord-button:hover, #home-button:hover { - background-color: #005b7f; +#github-button:hover, +#discord-button:hover, +#home-button:hover { + background-color: #005b7f; } #home-button { - display: block; - width: 200px; - height: 50px; - margin: 2em auto; - background-color: #008CBA; - color: white; - text-align: center; - line-height: 50px; - text-decoration: none; - font-weight: bold; - border-radius: 25px; - transition: all 0.3s ease-in-out; -} \ No newline at end of file + display: block; + width: 200px; + height: 50px; + margin: 2em auto; + background-color: #008cba; + color: white; + text-align: center; + line-height: 50px; + text-decoration: none; + font-weight: bold; + border-radius: 25px; + transition: all 0.3s ease-in-out; +} diff --git a/src/main/resources/static/css/fileSelect.css b/src/main/resources/static/css/fileSelect.css index 2cd2c682..e8f12979 100644 --- a/src/main/resources/static/css/fileSelect.css +++ b/src/main/resources/static/css/fileSelect.css @@ -1,10 +1,10 @@ .custom-file-label { - padding-right: 90px; + padding-right: 90px; } .selected-files { - margin-top: 10px; - max-height: 150px; - overflow-y: auto; - white-space: pre-wrap; -} \ No newline at end of file + margin-top: 10px; + max-height: 150px; + overflow-y: auto; + white-space: pre-wrap; +} diff --git a/src/main/resources/static/css/footer.css b/src/main/resources/static/css/footer.css new file mode 100644 index 00000000..f6cf093d --- /dev/null +++ b/src/main/resources/static/css/footer.css @@ -0,0 +1,20 @@ +#footer { + display: flex; + flex-direction: column; /* Stack children vertically */ + justify-content: center; + align-items: center; + width: 100%; +} + +.footer-center { + display: flex; + align-items: center; /* Center children horizontally */ + flex-grow: 1; +} + +.footer-powered-by { + margin-top: auto; /* Pushes the text to the bottom */ + color: grey; + text-align: center; /* Centers the text inside the div */ + width: 100%; /* Full width to center the text properly */ +} diff --git a/src/main/resources/static/css/game.css b/src/main/resources/static/css/game.css index 01b93e94..5b9f27d2 100644 --- a/src/main/resources/static/css/game.css +++ b/src/main/resources/static/css/game.css @@ -1,49 +1,54 @@ #game-container { - position: relative; - width: 100vh; - height: 0; - padding-bottom: 75%; /* 4:3 aspect ratio */ - background-color: transparent; - margin: auto; - overflow: hidden; - border: 2px solid black; /* Add border */ + position: relative; + width: 100vh; + height: 0; + padding-bottom: 75%; /* 4:3 aspect ratio */ + background-color: transparent; + margin: auto; + overflow: hidden; + border: 2px solid black; /* Add border */ } -.pdf, .player, .projectile { - position: absolute; +.pdf, +.player, +.projectile { + position: absolute; } .pdf { - width: 50px; - height: 50px; + width: 50px; + height: 50px; } .player { - width: 50px; - height: 50px; + width: 50px; + height: 50px; } .projectile { - background-color: black !important; - width: 5px; - height: 10px; + background-color: black !important; + width: 5px; + height: 10px; } -#score, #level, #lives, #high-score { - color: black; - font-family: sans-serif; - position: absolute; - font-size: calc(14px + 0.25vw); /* Reduced font size */ +#score, +#level, +#lives, +#high-score { + color: black; + font-family: sans-serif; + position: absolute; + font-size: calc(14px + 0.25vw); /* Reduced font size */ } #score { - top: 10px; - left: 10px; + top: 10px; + left: 10px; } #lives { - top: 10px; - left: calc(7vw); /* Adjusted position */ + top: 10px; + left: calc(7vw); /* Adjusted position */ } #high-score { - top: 10px; - left: calc(14vw); /* Adjusted position */ + top: 10px; + left: calc(14vw); /* Adjusted position */ } #level { - top: 10px; - right: 10px; -} \ No newline at end of file + top: 10px; + right: 10px; +} diff --git a/src/main/resources/static/css/general.css b/src/main/resources/static/css/general.css index 934074ca..8d631bfd 100644 --- a/src/main/resources/static/css/general.css +++ b/src/main/resources/static/css/general.css @@ -1,20 +1,20 @@ #page-container { - min-height: 100vh; - display: flex; - flex-direction: column; + min-height: 100vh; + display: flex; + flex-direction: column; } #content-wrap { - flex: 1; + flex: 1; } #footer { - bottom: 0; - width: 100%; + bottom: 0; + width: 100%; } .navbar { - height: auto; /* Adjusts height automatically based on content */ - white-space: nowrap; /* Prevents wrapping of navbar contents */ + height: auto; /* Adjusts height automatically based on content */ + white-space: nowrap; /* Prevents wrapping of navbar contents */ } /* TODO enable later .navbar .container { @@ -25,70 +25,70 @@ margin-right: auto; }*/ -html[lang-direction=ltr] * { - direction: ltr; +html[lang-direction="ltr"] * { + direction: ltr; } -html[lang-direction=rtl] * { - direction: rtl; - text-align: right; +html[lang-direction="rtl"] * { + direction: rtl; + text-align: right; } .ignore-rtl { - direction: ltr !important; - text-align: left !important; + direction: ltr !important; + text-align: left !important; } .align-top { - position: absolute; - top: 0; + position: absolute; + top: 0; } .align-center-right { - position: absolute; - right: 0; - top: 50%; + position: absolute; + right: 0; + top: 50%; } .align-center-left { - position: absolute; - left: 0; - top: 50%; + position: absolute; + left: 0; + top: 50%; } .align-bottom { - position: absolute; - bottom: 0; + position: absolute; + bottom: 0; } .btn-group > label:first-of-type { - border-top-left-radius: 0.25rem !important; - border-bottom-left-radius: 0.25rem !important; + border-top-left-radius: 0.25rem !important; + border-bottom-left-radius: 0.25rem !important; } html[lang-direction="rtl"] input.form-check-input { - position: relative; - margin-left: 0px; + position: relative; + margin-left: 0px; } html[lang-direction="rtl"] label.form-check-label { - display: inline; + display: inline; } .margin-auto-parent { - width: 100%; - display: flex; + width: 100%; + display: flex; } .margin-center { - margin: 0 auto; + margin: 0 auto; } #pdf-canvas { - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); - width: 100%; + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); + width: 100%; } .fixed-shadow-canvas { - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); - width: 100%; + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); + width: 100%; } .shadow-canvas { - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); } .hidden { - display: none; -} \ No newline at end of file + display: none; +} diff --git a/src/main/resources/static/css/home.css b/src/main/resources/static/css/home.css index fe184637..d975dd79 100644 --- a/src/main/resources/static/css/home.css +++ b/src/main/resources/static/css/home.css @@ -1,64 +1,62 @@ #searchBar { - background-image: url('../images/search.svg'); - background-position: 16px 16px; - background-repeat: no-repeat; - width: 100%; - font-size: 16px; - margin-bottom: 12px; - padding: 12px 20px 12px 40px; - border: 1px solid #ddd; - - + background-image: url("../images/search.svg"); + background-position: 16px 16px; + background-repeat: no-repeat; + width: 100%; + font-size: 16px; + margin-bottom: 12px; + padding: 12px 20px 12px 40px; + border: 1px solid #ddd; } .dark-mode-search { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' hei… 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z'/%3E%3C/svg%3E") !important; - color: #f8f9fa !important; - background-color: #212529 !important; - border-color: #343a40 !important; - } - - + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' hei… 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z'/%3E%3C/svg%3E") !important; + color: #f8f9fa !important; + background-color: #212529 !important; + border-color: #343a40 !important; +} .features-container { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(15rem, 3fr)); - gap: 25px 30px; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(15rem, 3fr)); + gap: 25px 30px; } .feature-card { - border: 2px solid rgba(0, 0, 0, .25); - border-radius: 0.25rem; - padding: 1.25rem; - display: flex; - flex-direction: column; - align-items: flex-start; - background: rgba(13, 110, 253, 0.05); - transition: transform 0.3s, border 0.3s; - transform-origin: center center; - outline: 2px solid transparent; + border: 2px solid rgba(0, 0, 0, 0.25); + border-radius: 0.25rem; + padding: 1.25rem; + display: flex; + flex-direction: column; + align-items: flex-start; + background: rgba(13, 110, 253, 0.05); + transition: + transform 0.3s, + border 0.3s; + transform-origin: center center; + outline: 2px solid transparent; } .feature-card a { - text-decoration: none; - color: inherit; - display: flex; - flex-direction: column; - width: 100%; - height: 100%; + text-decoration: none; + color: inherit; + display: flex; + flex-direction: column; + width: 100%; + height: 100%; } .feature-card .card-text { - flex: 1; + flex: 1; } .feature-card:hover { - outline: 1px solid rgba(0, 0, 0, .5); - cursor: pointer; - transform: scale(1.1); + outline: 1px solid rgba(0, 0, 0, 0.5); + cursor: pointer; + transform: scale(1.1); } .feature-card:hover .card-title { - text-decoration: underline; + text-decoration: underline; } .card-title.text-primary { color: #000; /* Replace with your desired shade of blue */ @@ -67,27 +65,27 @@ .home-card-icon { width: 30px; height: 30px; - transform: translateY(-5px); + transform: translateY(-5px); } .home-card-icon-colour { -filter: invert(0.2) sepia(2) saturate(50) hue-rotate(190deg); + filter: invert(0.2) sepia(2) saturate(50) hue-rotate(190deg); } .favorite-icon { - display: none; - position: absolute; - top: 10px; - right: 10px; + display: none; + position: absolute; + top: 10px; + right: 10px; } /* Only show the favorite icons when the parent card is being hovered over */ .feature-card:hover .favorite-icon { - display: block; + display: block; } .favorite-icon img { - filter: brightness(0); + filter: brightness(0); } .jumbotron { - padding: 3rem 3rem; /* Reduce vertical padding */ + padding: 3rem 3rem; /* Reduce vertical padding */ } diff --git a/src/main/resources/static/css/imageHighlighter.css b/src/main/resources/static/css/imageHighlighter.css index 231895d6..397c0c54 100644 --- a/src/main/resources/static/css/imageHighlighter.css +++ b/src/main/resources/static/css/imageHighlighter.css @@ -1,40 +1,43 @@ - #image-highlighter { - position: fixed; - display:flex; - inset: 0; - z-index: 10000; - background-color: rgba(0, 0, 0, 0); - visibility: hidden; - align-items: center; - justify-content: center; - transition: visbility 0.1s linear, background-color 0.1s linear; + position: fixed; + display: flex; + inset: 0; + z-index: 10000; + background-color: rgba(0, 0, 0, 0); + visibility: hidden; + align-items: center; + justify-content: center; + transition: + visbility 0.1s linear, + background-color 0.1s linear; } #image-highlighter > * { - max-width: 80vw; - max-height: 80vh; - animation: image-highlight .1s linear; - transition: transform .1s linear, opacity .1s linear; + max-width: 80vw; + max-height: 80vh; + animation: image-highlight 0.1s linear; + transition: + transform 0.1s linear, + opacity 0.1s linear; } #image-highlighter > *.remove { - transform: scale(0.8) !important; - opacity: 0 !important; + transform: scale(0.8) !important; + opacity: 0 !important; } #image-highlighter:not(:empty) { - background-color: rgba(0, 0, 0, 0.37); - visibility: visible; + background-color: rgba(0, 0, 0, 0.37); + visibility: visible; } @keyframes image-highlight { - from { - transform: scale(0.8); - opacity: 0; - } - to { - transform: scale(1); - opacity: 1; - } -} \ No newline at end of file + from { + transform: scale(0.8); + opacity: 0; + } + to { + transform: scale(1); + opacity: 1; + } +} diff --git a/src/main/resources/static/css/licenses.css b/src/main/resources/static/css/licenses.css new file mode 100644 index 00000000..79abdc34 --- /dev/null +++ b/src/main/resources/static/css/licenses.css @@ -0,0 +1,9 @@ +td a { + text-decoration: none; +} + +td a:hover, +td a:focus { + text-decoration: underline; + /* Adds underline on hover/focus for clarity */ +} diff --git a/src/main/resources/static/css/light-mode.css b/src/main/resources/static/css/light-mode.css index 08efbf4c..af84b0d5 100644 --- a/src/main/resources/static/css/light-mode.css +++ b/src/main/resources/static/css/light-mode.css @@ -1,14 +1,13 @@ /* Dark Mode Styles */ body { - --body-background-color: 255, 255, 255; - --base-font-color: 33, 37, 41; + --body-background-color: 255, 255, 255; + --base-font-color: 33, 37, 41; } - #global-buttons-container input { - background-color: #ffffff; - /*caret-color: #ffffff;*/ - /*color: #ffffff;*/ + background-color: #ffffff; + /*caret-color: #ffffff;*/ + /*color: #ffffff;*/ } /*#global-buttons-container input:disabled::-webkit-input-placeholder { !* WebKit browsers *!*/ /* color: #98A0AB;*/ diff --git a/src/main/resources/static/css/login.css b/src/main/resources/static/css/login.css new file mode 100644 index 00000000..743ee606 --- /dev/null +++ b/src/main/resources/static/css/login.css @@ -0,0 +1,111 @@ +html, +body { + height: 100%; +} + +body { + display: flex; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + width: 100%; + max-width: 330px; + padding: 15px; + margin: auto; +} + +.form-signin .checkbox { + font-weight: 400; +} + +.form-signin .form-floating:focus-within { + z-index: 2; +} + +.form-signin input[type="text"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} +.container-flex { + display: flex; + flex-direction: column; + min-height: 100vh; + width: 100%; /* Set width to 100% */ + align-items: center; /* Center its children horizontally */ +} +.footer-bottom { + margin-top: auto; +} +body.light-mode input:-webkit-autofill, +body.light-mode input:-webkit-autofill:hover, +body.light-mode input:-webkit-autofill:focus, +body.light-mode input:-webkit-autofill:active { + -webkit-text-fill-color: #212529; /* Dark font color */ + -webkit-box-shadow: 0 0 0 1000px #f8f9fa inset; /* Light background color */ +} + +/* Dark Mode */ +body.dark-mode input:-webkit-autofill, +body.dark-mode input:-webkit-autofill:hover, +body.dark-mode input:-webkit-autofill:focus, +body.dark-mode input:-webkit-autofill:active { + -webkit-text-fill-color: #f8f9fa; /* Light font color */ + -webkit-box-shadow: 0 0 0 1000px #212529 inset; /* Dark background color */ +} +/* Light Mode */ +body.light-mode .form-floating > input:focus + label { + color: #212529 !important; /* Dark text for light background */ +} + +/* Dark Mode */ +body.dark-mode .form-floating > input:focus + label { + color: #fff !important; /* Light text for dark background */ +} + +body.light-mode .form-floating > label { + color: #212529 !important; /* Dark text for light background */ +} + +body.dark-mode .form-floating > label { + color: #fff !important; /* Light text for dark background */ +} + +/* Removing default styles for ul and li */ +ul { + list-style: none; + padding: 0; + margin: 0; +} + +li { + list-style: none; +} + +/* Positioning the container of these elements to the top right */ +.your-container-class { + position: absolute; + top: 0; + right: 0; + display: flex; +} + +/* Styling for the dropdown */ +.dropdown-menu { + min-width: 200px; /* or whatever width you prefer */ +} + +.navbar-icon { + width: 40px; + height: 40px; +} diff --git a/src/main/resources/static/css/merge.css b/src/main/resources/static/css/merge.css index 866e2e8c..dc3c7657 100644 --- a/src/main/resources/static/css/merge.css +++ b/src/main/resources/static/css/merge.css @@ -1,4 +1,4 @@ - .list-group-item { +.list-group-item { display: flex; justify-content: space-between; align-items: center; @@ -25,5 +25,4 @@ .move-down span { font-weight: bold; font-size: 1.2em; - } diff --git a/src/main/resources/static/css/multi-tool.css b/src/main/resources/static/css/multi-tool.css new file mode 100644 index 00000000..9ed84f2b --- /dev/null +++ b/src/main/resources/static/css/multi-tool.css @@ -0,0 +1,119 @@ +.multi-tool-container { + max-width: 95vw; + margin: 0 auto; +} + +#global-buttons-container { + display: flex; + gap: 10px; + align-items: start; + + background-color: rgba(13, 110, 253, 0.1); + border: 1px solid rgba(0, 0, 0, 0.25); + backdrop-filter: blur(2px); + + top: 10px; + z-index: 10; + padding: 10px; + border-radius: 8px; +} +#global-buttons-container > * { + padding: 0.6rem 0.75rem; +} + +#global-buttons-container svg { + width: 20px; + height: 20px; +} +#export-button { + margin-left: auto; +} + +#pages-container-wrapper { + --background-color: rgba(0, 0, 0, 0.025); + --scroll-bar-color: #f1f1f1; + --scroll-bar-thumb: #888; + --scroll-bar-thumb-hover: #555; + background-color: var(--background-color); + width: 100%; + display: flex; + flex-direction: column; + padding: 10px 25px; + border-radius: 10px; + overflow-y: hidden; + overflow-x: auto; + min-height: 275px; + margin: 0 0 30px 0; +} + +#pages-container { + margin: auto; + gap: 0px; + display: flex; + align-items: center; + justify-content: center; +} + +/* width */ +#pages-container-wrapper::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +/* Track */ +#pages-container-wrapper::-webkit-scrollbar-track { + background: var(--scroll-bar-color); +} + +/* Handle */ +#pages-container-wrapper::-webkit-scrollbar-thumb { + border-radius: 10px; + background: var(--scroll-bar-thumb); +} + +/* Handle on hover */ +#pages-container-wrapper::-webkit-scrollbar-thumb:hover { + background: var(--scroll-bar-thumb-hover); +} + +.page-container { + height: 250px; + display: flex; + align-items: center; + flex-direction: column-reverse; + aspect-ratio: 1; + text-align: center; + position: relative; + user-select: none; + transition: width 1s linear; +} + +.page-container img { + /* max-width: calc(100% - 15px); */ + max-height: calc(100% - 15px); + max-width: 237px; + display: block; + position: absolute; + left: 50%; + top: 50%; + translate: -50% -50%; + box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.384); + border-radius: 4px; + transition: rotate 0.3s; +} + +#add-pdf-button { + margin: 0 auto; +} + +.page-number { + position: absolute; + top: 5px; + right: 5px; + color: white; + background-color: #007bff; /* Primary blue color */ + padding: 3px 6px; + border-radius: 4px; + font-size: 12px; + z-index: 2; +} diff --git a/src/main/resources/static/css/navbar.css b/src/main/resources/static/css/navbar.css index 5bb99a5e..f46c44a6 100644 --- a/src/main/resources/static/css/navbar.css +++ b/src/main/resources/static/css/navbar.css @@ -1,80 +1,116 @@ - - #navbarSearch { - top: 100%; - right: 0; + top: 100%; + right: 0; + transition: all 0.3s; + max-height: 0; + overflow: hidden; +} + +#navbarSearch.show { + max-height: 300px; /* Adjust this to your desired max height */ } #searchForm { - width: 200px; /* Adjust this value as needed */ + width: 200px; /* Adjust this value as needed */ } /* Style the search results to match the navbar */ #searchResults { - max-height: 200px; /* Adjust this value as needed */ - overflow-y: auto; - width: 100%; + max-height: 200px; /* Adjust this value as needed */ + overflow-y: auto; + width: 100%; + max-width: 300px; /* Adjust to your preferred width */ + transition: height 0.3s ease; /* Smooth height transition */ } #searchResults .dropdown-item { - display: flex; - align-items: center; - white-space: nowrap; - height: 50px; /* Fixed height */ - overflow: hidden; /* Hide overflow */ + display: flex; + align-items: center; + white-space: nowrap; + height: 50px; /* Fixed height */ + overflow: hidden; /* Hide overflow */ } #searchResults .icon { - margin-right: 10px; + margin-right: 10px; } #searchResults .icon-text { - display: inline; - overflow: hidden; /* Hide overflow */ - text-overflow: ellipsis; /* Add ellipsis for long text */ + display: inline; + overflow: hidden; /* Hide overflow */ + text-overflow: ellipsis; /* Add ellipsis for long text */ } +#search-icon i { + font-size: 24px; /* Adjust this to your desired size */ + transition: color 0.3s; +} +#search-icon:hover i { + color: #666; /* Adjust this to your hover color */ +} + +.search-input { + transition: + border 0.3s, + box-shadow 0.3s; +} + +.search-input:focus { + border-color: #666; /* Adjust this to your focus color */ + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); /* Adjust this to your desired shadow */ +} + +/* Set a fixed height and styling for each search result item */ +.search-results a { + display: flex; + align-items: center; + gap: 10px; /* space between icon and text */ + height: 40px; /* Adjust based on your design */ + overflow: hidden; /* Prevent content from overflowing */ + white-space: nowrap; /* Prevent text from wrapping to next line */ + text-overflow: ellipsis; /* Truncate text if it's too long */ +} .main-icon { - width: 36px; - height: 36px; - vertical-align: middle; - transform: translateY(-2px); + width: 36px; + height: 36px; + vertical-align: middle; + transform: translateY(-2px); } .icon { - width: 16px; - height: 16px; - vertical-align: middle; - transform: translateY(-2px); + width: 16px; + height: 16px; + vertical-align: middle; + transform: translateY(-2px); } -.icon+.icon { - margin-left: -4px; +.icon + .icon { + margin-left: -4px; } .icon-text { - margin-left: 4px; + margin-left: 4px; } .nav-item-separator { - position: relative; - margin: 0 4px; /* Adjust the margin as needed */ + position: relative; + margin: 0 4px; /* Adjust the margin as needed */ } .nav-item-separator::before { - content: ''; - position: absolute; - left: 0; - top: 10%; /* Adjust the top and bottom margins as needed */ - bottom: 10%; - width: 1px; - background-color: #ccc; /* Adjust the color as needed */ + content: ""; + position: absolute; + left: 0; + top: 10%; /* Adjust the top and bottom margins as needed */ + bottom: 10%; + width: 1px; + background-color: #ccc; /* Adjust the color as needed */ } .navbar-icon { - width: 20px; - height: 20px; - transform: translateY(-2px); -} \ No newline at end of file + width: 20px; + height: 20px; + transform: translateY(-2px); +} diff --git a/src/main/resources/static/css/pdfActions.css b/src/main/resources/static/css/pdfActions.css index 98c29dbe..ff680036 100644 --- a/src/main/resources/static/css/pdfActions.css +++ b/src/main/resources/static/css/pdfActions.css @@ -1,87 +1,85 @@ - .pdf-actions_button-container { - z-index: 2; - display:flex; - opacity: 0; - transition: opacity 0.1s linear; + z-index: 2; + display: flex; + opacity: 0; + transition: opacity 0.1s linear; } .pdf-actions_container:hover .pdf-actions_button-container { - opacity: 1; + opacity: 1; } .pdf-actions_button-container > * { - padding: 0.25rem 0.5rem; - margin: 3px; - display: block; + padding: 0.25rem 0.5rem; + margin: 3px; + display: block; } .pdf-actions_container svg { - width: 16px; - height: 16px; + width: 16px; + height: 16px; } .pdf-actions_container:nth-child(1) .pdf-actions_move-left-button { - display: none; + display: none; } .pdf-actions_container:last-child .pdf-actions_move-right-button { - display: none; + display: none; } /* "insert pdf" buttons that appear on the right when hover */ .pdf-actions_insert-file-button-container { - translate: 0 -50%; - width: 80px; - height: 100%; + translate: 0 -50%; + width: 80px; + height: 100%; - z-index: 1; - opacity: 0; - transition: opacity 0.2s; + z-index: 1; + opacity: 0; + transition: opacity 0.2s; } .pdf-actions_insert-file-button-container.left { - left: -20px; + left: -20px; } .pdf-actions_insert-file-button-container.right { - right: -20px; + right: -20px; } -html[lang-direction=ltr] .pdf-actions_insert-file-button-container.right { - display:none; +html[lang-direction="ltr"] .pdf-actions_insert-file-button-container.right { + display: none; } -html[lang-direction=rtl] .pdf-actions_insert-file-button-container.left { - display:none; +html[lang-direction="rtl"] .pdf-actions_insert-file-button-container.left { + display: none; } .pdf-actions_insert-file-button-container.left .pdf-actions_insert-file-button { - left: 0; - translate: 0 -50%; + left: 0; + translate: 0 -50%; } .pdf-actions_insert-file-button-container.right .pdf-actions_insert-file-button { - right: 0; - translate: 0 -50%; + right: 0; + translate: 0 -50%; } -html[lang-direction=ltr] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.right { - display: block; +html[lang-direction="ltr"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.right { + display: block; } - -html[lang-direction=rtl] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.left { - display: block; +html[lang-direction="rtl"] .pdf-actions_container:last-child > .pdf-actions_insert-file-button-container.left { + display: block; } .pdf-actions_insert-file-button-container:hover { - opacity: 1; - transition: opacity 0.05s; + opacity: 1; + transition: opacity 0.05s; } .pdf-actions_insert-file-button { - position: absolute; - top: 50%; - right: 50%; - translate: 50% -50%; - aspect-ratio: 1; - border-radius: 100px; -} \ No newline at end of file + position: absolute; + top: 50%; + right: 50%; + translate: 50% -50%; + aspect-ratio: 1; + border-radius: 100px; +} diff --git a/src/main/resources/static/css/pipeline.css b/src/main/resources/static/css/pipeline.css new file mode 100644 index 00000000..9468333b --- /dev/null +++ b/src/main/resources/static/css/pipeline.css @@ -0,0 +1,21 @@ +.btn-margin { + margin-right: 2px; +} + +.bordered-box { + border: 1px solid #ddd; + padding: 20px; + margin: 20px; + width: 70%; +} + +.center-element { + width: 80%; + text-align: center; + margin: auto; +} + +.element-margin { + margin: 10px 0; + /* Adjust this value to increase/decrease the margin as needed */ +} diff --git a/src/main/resources/static/css/rainbow-mode.css b/src/main/resources/static/css/rainbow-mode.css index 2c58adf5..921423a5 100644 --- a/src/main/resources/static/css/rainbow-mode.css +++ b/src/main/resources/static/css/rainbow-mode.css @@ -1,37 +1,113 @@ /* Rainbow Mode Styles */ body { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%); - color: #fff !important; - --body-background-color: 255, 255, 255; - --base-font-color: 33, 37, 41; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ); + color: #fff !important; + --body-background-color: 255, 255, 255; + --base-font-color: 33, 37, 41; } .dark-card { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important; - color: white !important; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ) !important; + color: white !important; } .jumbotron { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%); - color: #fff !important; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ); + color: #fff !important; } .list-group { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important; - color: fff !important; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ) !important; + color: fff !important; } .list-group-item { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important; - color: fff !important; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ) !important; + color: fff !important; } #support-section { - background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important; + background: linear-gradient( + 90deg, + rgba(255, 0, 0, 1) 0%, + rgba(255, 154, 0, 1) 10%, + rgba(208, 222, 33, 1) 20%, + rgba(79, 220, 74, 1) 30%, + rgba(63, 218, 216, 1) 40%, + rgba(47, 201, 226, 1) 50%, + rgba(28, 127, 238, 1) 60%, + rgba(95, 21, 242, 1) 70%, + rgba(186, 12, 248, 1) 80%, + rgba(251, 7, 217, 1) 90%, + rgba(255, 0, 0, 1) 100% + ) !important; } - #pages-container-wrapper { --background-color: rgba(255, 255, 255, 0.046) !important; --scroll-bar-color: #4c4c4c !important; --scroll-bar-thumb: #d3d3d3 !important; --scroll-bar-thumb-hover: #ffffff !important; } - diff --git a/src/main/resources/static/css/rotate-pdf.css b/src/main/resources/static/css/rotate-pdf.css new file mode 100644 index 00000000..7c5d388d --- /dev/null +++ b/src/main/resources/static/css/rotate-pdf.css @@ -0,0 +1,29 @@ +#pdf-preview { + margin: 0 auto; + display: block; + max-width: calc(100% - 30px); + max-height: calc(100% - 30px); + box-shadow: 0 0 4px rgba(100, 100, 100, 0.25); + transition: rotate 0.3s; + position: absolute; + top: 50%; + left: 50%; + translate: -50% -50%; +} + +.previewContainer { + aspect-ratio: 1; + width: 100%; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; + margin: 1rem 0; + padding: 15px; + display: block; + overflow: hidden; + position: relative; +} + +.buttonContainer { + display: flex; + justify-content: space-around; +} diff --git a/src/main/resources/static/css/sign.css b/src/main/resources/static/css/sign.css new file mode 100644 index 00000000..c6ae3374 --- /dev/null +++ b/src/main/resources/static/css/sign.css @@ -0,0 +1,39 @@ +select#font-select, +select#font-select option { + height: 60px; /* Adjust as needed */ + font-size: 30px; /* Adjust as needed */ +} + +.drawing-pad-container { + text-align: center; +} + +#drawing-pad-canvas { + background: rgba(125, 125, 125, 0.2); + width: 100%; + height: 300px; +} +#box-drag-container { + position: relative; + margin: 20px 0; +} +.draggable-buttons-box { + position: absolute; + top: 0; + padding: 10px; + width: 100%; + display: flex; + gap: 5px; +} +.draggable-buttons-box > button { + z-index: 10; + background-color: rgba(13, 110, 253, 0.1); +} +.draggable-canvas { + border: 1px solid red; + position: absolute; + touch-action: none; + user-select: none; + top: 0px; + left: 0; +} diff --git a/src/main/resources/static/css/split-pdf-by-sections.css b/src/main/resources/static/css/split-pdf-by-sections.css new file mode 100644 index 00000000..7520c10e --- /dev/null +++ b/src/main/resources/static/css/split-pdf-by-sections.css @@ -0,0 +1,10 @@ +.pdf-visual-aid { + width: 150px; /* Adjust as needed */ + height: 200px; /* Adjust as needed */ + border: 1px solid black; /* Represents the PDF page */ + position: relative; +} +.line { + position: absolute; + background-color: red; /* Line color */ +} diff --git a/src/main/resources/static/css/stamp.css b/src/main/resources/static/css/stamp.css new file mode 100644 index 00000000..9fed6178 --- /dev/null +++ b/src/main/resources/static/css/stamp.css @@ -0,0 +1,41 @@ +.a4container { + position: relative; + width: 50%; + aspect-ratio: 0.707; + border: 1px solid #ddd; + box-sizing: border-box; + background-color: white; +} + +.pageNumber { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + font-size: 1em; + color: #333; + cursor: pointer; + background-color: #ccc; + width: 15%; + height: 15%; + transform: translate(-50%, -50%); +} + +.pageNumber:hover { + background-color: #eee; +} + +#myForm { + display: flex; + justify-content: center; + align-items: center; + margin-top: 20px; +} + +.selectedPosition { + background-color: #0a0; +} + +.selectedPosition.selectedHovered { + background-color: #006600; +} diff --git a/src/main/resources/static/css/tab-container.css b/src/main/resources/static/css/tab-container.css index f6609de4..cf048650 100644 --- a/src/main/resources/static/css/tab-container.css +++ b/src/main/resources/static/css/tab-container.css @@ -1,26 +1,24 @@ - .tab-group { - } .tab-container { - display: none; + display: none; } .tab-container.active { - display: block; - border: 1px solid rgba(var(--base-font-color), 0.25); - padding: 15px; + display: block; + border: 1px solid rgba(var(--base-font-color), 0.25); + padding: 15px; } .tab-buttons > button { - margin-bottom: -1px; - background: 0 0; - border: 1px solid transparent; - color: rgb(var(--base-font-color)); + margin-bottom: -1px; + background: 0 0; + border: 1px solid transparent; + color: rgb(var(--base-font-color)); - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; } .tab-buttons > button.active { - background-color: rgb(var(--body-background-color)); - border-color: rgba(var(--base-font-color), 0.25) rgba(var(--base-font-color), 0.25) rgb(var(--body-background-color)); -} \ No newline at end of file + background-color: rgb(var(--body-background-color)); + border-color: rgba(var(--base-font-color), 0.25) rgba(var(--base-font-color), 0.25) rgb(var(--body-background-color)); +} diff --git a/src/main/resources/static/js/darkmode.js b/src/main/resources/static/js/darkmode.js index d3c62266..cb119a8a 100644 --- a/src/main/resources/static/js/darkmode.js +++ b/src/main/resources/static/js/darkmode.js @@ -1,5 +1,5 @@ -var toggleCount = 0 -var lastToggleTime = Date.now() +var toggleCount = 0; +var lastToggleTime = Date.now(); var elements = { lightModeStyles: null, @@ -11,18 +11,18 @@ var elements = { navbar: null, navIcons: null, navDropdownMenus: null, -} +}; function getElements() { - elements.lightModeStyles = document.getElementById("light-mode-styles") - elements.darkModeStyles = document.getElementById("dark-mode-styles") - elements.rainbowModeStyles = document.getElementById("rainbow-mode-styles") - elements.darkModeIcon = document.getElementById("dark-mode-icon") - elements.searchBar = document.getElementById("searchBar") - elements.formControls = document.querySelectorAll(".form-control") - elements.navbar = document.querySelectorAll("nav.navbar") - elements.navIcons = document.querySelectorAll("nav .icon, .navbar-icon") - elements.navDropdownMenus = document.querySelectorAll("nav .dropdown-menu") + elements.lightModeStyles = document.getElementById("light-mode-styles"); + elements.darkModeStyles = document.getElementById("dark-mode-styles"); + elements.rainbowModeStyles = document.getElementById("rainbow-mode-styles"); + elements.darkModeIcon = document.getElementById("dark-mode-icon"); + elements.searchBar = document.getElementById("searchBar"); + elements.formControls = document.querySelectorAll(".form-control"); + elements.navbar = document.querySelectorAll("nav.navbar"); + elements.navIcons = document.querySelectorAll("nav .icon, .navbar-icon"); + elements.navDropdownMenus = document.querySelectorAll(".dropdown-menu"); } function setMode(mode) { var event = new CustomEvent("modeChanged", { detail: mode }); @@ -48,22 +48,22 @@ function setMode(mode) { elements.searchBar.classList.add("dark-mode-search"); } if (elements && elements.formControls) { - elements.formControls.forEach(input => input.classList.add("bg-dark", "text-white")); + elements.formControls.forEach((input) => input.classList.add("bg-dark", "text-white")); } if (elements && elements.navbar) { - elements.navbar.forEach(navElement => { + elements.navbar.forEach((navElement) => { navElement.classList.remove("navbar-light", "bg-light"); navElement.classList.add("navbar-dark", "bg-dark"); }); } if (elements && elements.navDropdownMenus) { - elements.navDropdownMenus.forEach(menu => menu.classList.add("dropdown-menu-dark")); + elements.navDropdownMenus.forEach((menu) => menu.classList.add("dropdown-menu-dark")); } if (elements && elements.navIcons) { - elements.navIcons.forEach(icon => (icon.style.filter = "invert(1)")); + elements.navIcons.forEach((icon) => (icon.style.filter = "invert(1)")); } var tables = document.querySelectorAll(".table"); - tables.forEach(table => { + tables.forEach((table) => { table.classList.add("table-dark"); }); if (jumbotron) { @@ -78,22 +78,22 @@ function setMode(mode) { elements.searchBar.classList.remove("dark-mode-search"); } if (elements && elements.formControls) { - elements.formControls.forEach(input => input.classList.remove("bg-dark", "text-white")); + elements.formControls.forEach((input) => input.classList.remove("bg-dark", "text-white")); } if (elements && elements.navbar) { - elements.navbar.forEach(navElement => { + elements.navbar.forEach((navElement) => { navElement.classList.remove("navbar-dark", "bg-dark"); navElement.classList.add("navbar-light", "bg-light"); }); } if (elements && elements.navDropdownMenus) { - elements.navDropdownMenus.forEach(menu => menu.classList.remove("dropdown-menu-dark")); + elements.navDropdownMenus.forEach((menu) => menu.classList.remove("dropdown-menu-dark")); } if (elements && elements.navIcons) { - elements.navIcons.forEach(icon => (icon.style.filter = "none")); + elements.navIcons.forEach((icon) => (icon.style.filter = "none")); } var tables = document.querySelectorAll(".table-dark"); - tables.forEach(table => { + tables.forEach((table) => { table.classList.remove("table-dark"); }); if (jumbotron) { @@ -108,43 +108,43 @@ function setMode(mode) { } function toggleDarkMode() { - var currentTime = Date.now() + var currentTime = Date.now(); if (currentTime - lastToggleTime < 1000) { - toggleCount++ + toggleCount++; } else { - toggleCount = 1 + toggleCount = 1; } - lastToggleTime = currentTime + lastToggleTime = currentTime; if (toggleCount >= 18) { - localStorage.setItem("dark-mode", "rainbow") - setMode("rainbow") + localStorage.setItem("dark-mode", "rainbow"); + setMode("rainbow"); } else if (localStorage.getItem("dark-mode") == "on") { - localStorage.setItem("dark-mode", "off") - setMode("off") + localStorage.setItem("dark-mode", "off"); + setMode("off"); } else { - localStorage.setItem("dark-mode", "on") - setMode("on") + localStorage.setItem("dark-mode", "on"); + setMode("on"); } } document.addEventListener("DOMContentLoaded", function () { - getElements() + getElements(); - var currentMode = localStorage.getItem("dark-mode") + var currentMode = localStorage.getItem("dark-mode"); if (currentMode === "on" || currentMode === "off" || currentMode === "rainbow") { - setMode(currentMode) + setMode(currentMode); } else if (window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches) { - setMode("on") + setMode("on"); } else { - setMode("off") + setMode("off"); } var darkModeToggle = document.getElementById("dark-mode-toggle"); if (darkModeToggle !== null) { - darkModeToggle.addEventListener("click", function (event) { - event.preventDefault(); - toggleDarkMode(); - }); - } -}) + darkModeToggle.addEventListener("click", function (event) { + event.preventDefault(); + toggleDarkMode(); + }); + } +}); diff --git a/src/main/resources/static/js/downloader.js b/src/main/resources/static/js/downloader.js index 8971f98e..842e9df0 100644 --- a/src/main/resources/static/js/downloader.js +++ b/src/main/resources/static/js/downloader.js @@ -1,242 +1,235 @@ function showErrorBanner(message, stackTrace) { - const errorContainer = document.getElementById("errorContainer"); - errorContainer.style.display = "block"; // Display the banner - document.querySelector("#errorContainer .alert-heading").textContent = "Error"; - document.querySelector("#errorContainer p").textContent = message; - document.querySelector("#traceContent").textContent = stackTrace; + const errorContainer = document.getElementById("errorContainer"); + errorContainer.style.display = "block"; // Display the banner + document.querySelector("#errorContainer .alert-heading").textContent = "Error"; + document.querySelector("#errorContainer p").textContent = message; + document.querySelector("#traceContent").textContent = stackTrace; } let firstErrorOccurred = false; -$(document).ready(function() { - $('form').submit(async function(event) { - event.preventDefault(); - firstErrorOccurred = false; - const url = this.action; - const files = $('#fileInput-input')[0].files; - const formData = new FormData(this); +$(document).ready(function () { + $("form").submit(async function (event) { + event.preventDefault(); + firstErrorOccurred = false; + const url = this.action; + const files = $("#fileInput-input")[0].files; + const formData = new FormData(this); - // Remove empty file entries - for (let [key, value] of formData.entries()) { - if (value instanceof File && !value.name) { - formData.delete(key); - } + // Remove empty file entries + for (let [key, value] of formData.entries()) { + if (value instanceof File && !value.name) { + formData.delete(key); + } + } + const override = $("#override").val() || ""; + const originalButtonText = $("#submitBtn").text(); + $("#submitBtn").text("Processing..."); + console.log(override); + try { + if (remoteCall === true) { + if (override === "multi" || (!multiple && files.length > 1 && override !== "single")) { + await submitMultiPdfForm(url, files); + } else { + await handleSingleDownload(url, formData); } - const override = $('#override').val() || ''; - const originalButtonText = $('#submitBtn').text(); - $('#submitBtn').text('Processing...'); - console.log(override); - try { - if(remoteCall === true) { - if (override === 'multi' || (!multiple && files.length > 1) && override !== 'single' ) { - await submitMultiPdfForm(url, files); - } else { - await handleSingleDownload(url, formData); - } - } - $('#submitBtn').text(originalButtonText); - } catch (error) { - handleDownloadError(error); - $('#submitBtn').text(originalButtonText); - console.error(error); - } - }); + } + $("#submitBtn").text(originalButtonText); + } catch (error) { + handleDownloadError(error); + $("#submitBtn").text(originalButtonText); + console.error(error); + } + }); }); +async function handleSingleDownload(url, formData, isMulti = false, isZip = false) { + try { + const response = await fetch(url, { method: "POST", body: formData }); + const contentType = response.headers.get("content-type"); + if (!response.ok) { + if (contentType && contentType.includes("application/json")) { + return handleJsonResponse(response); + console.error("Throwing error banner, response was not okay"); + } + throw new Error(`HTTP error! status: ${response.status}`); + } -async function handleSingleDownload(url, formData, isMulti = false , isZip = false) { - try { - const response = await fetch(url, { method: 'POST', body: formData }); - const contentType = response.headers.get('content-type'); + const contentDisposition = response.headers.get("Content-Disposition"); + let filename = getFilenameFromContentDisposition(contentDisposition); - if (!response.ok) { - if (contentType && contentType.includes('application/json')) { - return handleJsonResponse(response); - console.error('Throwing error banner, response was not okay'); - } - throw new Error(`HTTP error! status: ${response.status}`); - } - - const contentDisposition = response.headers.get('Content-Disposition'); - let filename = getFilenameFromContentDisposition(contentDisposition); - - const blob = await response.blob(); - if (contentType.includes('application/pdf') || contentType.includes('image/')) { - return handleResponse(blob, filename, !isMulti, isZip); - } else { - return handleResponse(blob, filename, false, isZip); - } - } catch (error) { - console.error('Error in handleSingleDownload:', error); - throw error; // Re-throw the error if you want it to be handled higher up. - } + const blob = await response.blob(); + if (contentType.includes("application/pdf") || contentType.includes("image/")) { + return handleResponse(blob, filename, !isMulti, isZip); + } else { + return handleResponse(blob, filename, false, isZip); + } + } catch (error) { + console.error("Error in handleSingleDownload:", error); + throw error; // Re-throw the error if you want it to be handled higher up. + } } function getFilenameFromContentDisposition(contentDisposition) { - let filename; + let filename; - if (contentDisposition && contentDisposition.indexOf('attachment') !== -1) { - filename = decodeURIComponent(contentDisposition.split('filename=')[1].replace(/"/g, '')).trim(); - } else { - // If the Content-Disposition header is not present or does not contain the filename, use a default filename - filename = 'download'; - } + if (contentDisposition && contentDisposition.indexOf("attachment") !== -1) { + filename = decodeURIComponent(contentDisposition.split("filename=")[1].replace(/"/g, "")).trim(); + } else { + // If the Content-Disposition header is not present or does not contain the filename, use a default filename + filename = "download"; + } - return filename; + return filename; } - - async function handleJsonResponse(response) { - const json = await response.json(); - const errorMessage = JSON.stringify(json, null, 2); - if (errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided') || errorMessage.toLowerCase().includes('PDF contains an encryption dictionary')) { - if (!firstErrorOccurred) { - firstErrorOccurred = true; - alert(pdfPasswordPrompt); - } - } else { - showErrorBanner(json.error + ':' + json.message, json.trace); - } + const json = await response.json(); + const errorMessage = JSON.stringify(json, null, 2); + if ( + errorMessage.toLowerCase().includes("the password is incorrect") || + errorMessage.toLowerCase().includes("Password is not provided") || + errorMessage.toLowerCase().includes("PDF contains an encryption dictionary") + ) { + if (!firstErrorOccurred) { + firstErrorOccurred = true; + alert(pdfPasswordPrompt); + } + } else { + showErrorBanner(json.error + ":" + json.message, json.trace); + } } - async function handleResponse(blob, filename, considerViewOptions = false, isZip = false) { - if (!blob) return; - const downloadOption = localStorage.getItem('downloadOption'); - if (considerViewOptions) { - if (downloadOption === 'sameWindow') { - const url = URL.createObjectURL(blob); - window.location.href = url; - return; - } else if (downloadOption === 'newWindow') { - const url = URL.createObjectURL(blob); - window.open(url, '_blank'); - return; - } - } - if(!isZip){ - downloadFile(blob, filename); - } - return { filename, blob }; + if (!blob) return; + const downloadOption = localStorage.getItem("downloadOption"); + if (considerViewOptions) { + if (downloadOption === "sameWindow") { + const url = URL.createObjectURL(blob); + window.location.href = url; + return; + } else if (downloadOption === "newWindow") { + const url = URL.createObjectURL(blob); + window.open(url, "_blank"); + return; + } + } + if (!isZip) { + downloadFile(blob, filename); + } + return { filename, blob }; } function handleDownloadError(error) { - const errorMessage = error.message; - showErrorBanner(errorMessage); + const errorMessage = error.message; + showErrorBanner(errorMessage); } let urls = []; // An array to hold all the URLs function downloadFile(blob, filename) { - if (!(blob instanceof Blob)) { - console.error('Invalid blob passed to downloadFile function'); - return; - } - const url = URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = filename; - a.click(); - urls.push(url); // Store the URL so it doesn't get garbage collected too soon + if (!(blob instanceof Blob)) { + console.error("Invalid blob passed to downloadFile function"); + return; + } + const url = URL.createObjectURL(blob); + const a = document.createElement("a"); + a.href = url; + a.download = filename; + a.click(); + urls.push(url); // Store the URL so it doesn't get garbage collected too soon - return { filename, blob }; + return { filename, blob }; } - - async function submitMultiPdfForm(url, files) { - const zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4; - const zipFiles = files.length > zipThreshold; - let jszip = null; - // Show the progress bar - $('#progressBarContainer').show(); - // Initialize the progress bar + const zipThreshold = parseInt(localStorage.getItem("zipThreshold"), 10) || 4; + const zipFiles = files.length > zipThreshold; + let jszip = null; + // Show the progress bar + $("#progressBarContainer").show(); + // Initialize the progress bar - let progressBar = $('#progressBar'); - progressBar.css('width', '0%'); - progressBar.attr('aria-valuenow', 0); - progressBar.attr('aria-valuemax', files.length); + let progressBar = $("#progressBar"); + progressBar.css("width", "0%"); + progressBar.attr("aria-valuenow", 0); + progressBar.attr("aria-valuemax", files.length); - if (zipFiles) { - jszip = new JSZip(); - } + if (zipFiles) { + jszip = new JSZip(); + } + // Get the form with the method attribute set to POST + let postForm = document.querySelector('form[method="POST"]'); - // Get the form with the method attribute set to POST - let postForm = document.querySelector('form[method="POST"]'); - - // Get existing form data - let formData; - if (postForm) { - formData = new FormData($(postForm)[0]); // Convert the form to a jQuery object and get the raw DOM element - } else { - console.log("No form with POST method found."); - } - //Remove file to reuse parameters for other runs - formData.delete('fileInput'); - // Remove empty file entries - for (let [key, value] of formData.entries()) { - if (value instanceof File && !value.name) { - formData.delete(key); - } + // Get existing form data + let formData; + if (postForm) { + formData = new FormData($(postForm)[0]); // Convert the form to a jQuery object and get the raw DOM element + } else { + console.log("No form with POST method found."); + } + //Remove file to reuse parameters for other runs + formData.delete("fileInput"); + // Remove empty file entries + for (let [key, value] of formData.entries()) { + if (value instanceof File && !value.name) { + formData.delete(key); } - const CONCURRENCY_LIMIT = 8; - const chunks = []; - for (let i = 0; i < Array.from(files).length; i += CONCURRENCY_LIMIT) { - chunks.push(Array.from(files).slice(i, i + CONCURRENCY_LIMIT)); - } + } + const CONCURRENCY_LIMIT = 8; + const chunks = []; + for (let i = 0; i < Array.from(files).length; i += CONCURRENCY_LIMIT) { + chunks.push(Array.from(files).slice(i, i + CONCURRENCY_LIMIT)); + } - for (const chunk of chunks) { - const promises = chunk.map(async file => { - let fileFormData = new FormData(); - fileFormData.append('fileInput', file); - console.log(fileFormData); - // Add other form data - for (let pair of formData.entries()) { - fileFormData.append(pair[0], pair[1]); - console.log(pair[0]+ ', ' + pair[1]); - } + for (const chunk of chunks) { + const promises = chunk.map(async (file) => { + let fileFormData = new FormData(); + fileFormData.append("fileInput", file); + console.log(fileFormData); + // Add other form data + for (let pair of formData.entries()) { + fileFormData.append(pair[0], pair[1]); + console.log(pair[0] + ", " + pair[1]); + } - try { - const downloadDetails = await handleSingleDownload(url, fileFormData, true, zipFiles); - console.log(downloadDetails); - if (zipFiles) { - jszip.file(downloadDetails.filename, downloadDetails.blob); - } else { - //downloadFile(downloadDetails.blob, downloadDetails.filename); - } - updateProgressBar(progressBar, Array.from(files).length); - } catch (error) { - handleDownloadError(error); - console.error(error); - } - }); - await Promise.all(promises); + try { + const downloadDetails = await handleSingleDownload(url, fileFormData, true, zipFiles); + console.log(downloadDetails); + if (zipFiles) { + jszip.file(downloadDetails.filename, downloadDetails.blob); + } else { + //downloadFile(downloadDetails.blob, downloadDetails.filename); + } + updateProgressBar(progressBar, Array.from(files).length); + } catch (error) { + handleDownloadError(error); + console.error(error); + } + }); + await Promise.all(promises); + } - } - - if (zipFiles) { - try { - const content = await jszip.generateAsync({ type: "blob" }); - downloadFile(content, "files.zip"); - } catch (error) { - console.error('Error generating ZIP file: ' + error); - } - } - progressBar.css('width', '100%'); - progressBar.attr('aria-valuenow', Array.from(files).length); + if (zipFiles) { + try { + const content = await jszip.generateAsync({ type: "blob" }); + downloadFile(content, "files.zip"); + } catch (error) { + console.error("Error generating ZIP file: " + error); + } + } + progressBar.css("width", "100%"); + progressBar.attr("aria-valuenow", Array.from(files).length); } - - function updateProgressBar(progressBar, files) { - let progress = ((progressBar.attr('aria-valuenow') / files.length) * 100) + (100 / files.length); - progressBar.css('width', progress + '%'); - progressBar.attr('aria-valuenow', parseInt(progressBar.attr('aria-valuenow')) + 1); + let progress = (progressBar.attr("aria-valuenow") / files.length) * 100 + 100 / files.length; + progressBar.css("width", progress + "%"); + progressBar.attr("aria-valuenow", parseInt(progressBar.attr("aria-valuenow")) + 1); } -window.addEventListener('unload', () => { - for (const url of urls) { - URL.revokeObjectURL(url); - } +window.addEventListener("unload", () => { + for (const url of urls) { + URL.revokeObjectURL(url); + } }); diff --git a/src/main/resources/static/js/draggable-utils.js b/src/main/resources/static/js/draggable-utils.js index 2263e540..bff4c3d4 100644 --- a/src/main/resources/static/js/draggable-utils.js +++ b/src/main/resources/static/js/draggable-utils.js @@ -1,282 +1,287 @@ const DraggableUtils = { + boxDragContainer: document.getElementById("box-drag-container"), + pdfCanvas: document.getElementById("pdf-canvas"), + nextId: 0, + pdfDoc: null, + pageIndex: 0, + documentsMap: new Map(), - boxDragContainer: document.getElementById('box-drag-container'), - pdfCanvas: document.getElementById('pdf-canvas'), - nextId: 0, - pdfDoc: null, - pageIndex: 0, - documentsMap: new Map(), + init() { + interact(".draggable-canvas") + .draggable({ + listeners: { + move: (event) => { + const target = event.target; + const x = (parseFloat(target.getAttribute("data-bs-x")) || 0) + event.dx; + const y = (parseFloat(target.getAttribute("data-bs-y")) || 0) + event.dy; - init() { - interact('.draggable-canvas') - .draggable({ - listeners: { - move: (event) => { - const target = event.target; - const x = (parseFloat(target.getAttribute('data-bs-x')) || 0) + event.dx; - const y = (parseFloat(target.getAttribute('data-bs-y')) || 0) + event.dy; + target.style.transform = `translate(${x}px, ${y}px)`; + target.setAttribute("data-bs-x", x); + target.setAttribute("data-bs-y", y); - target.style.transform = `translate(${x}px, ${y}px)`; - target.setAttribute('data-bs-x', x); - target.setAttribute('data-bs-y', y); - - this.onInteraction(target); - }, - }, - }) - .resizable({ - edges: { left: true, right: true, bottom: true, top: true }, - listeners: { - move: (event) => { - var target = event.target - var x = (parseFloat(target.getAttribute('data-bs-x')) || 0) - var y = (parseFloat(target.getAttribute('data-bs-y')) || 0) + this.onInteraction(target); + }, + }, + }) + .resizable({ + edges: { left: true, right: true, bottom: true, top: true }, + listeners: { + move: (event) => { + var target = event.target; + var x = parseFloat(target.getAttribute("data-bs-x")) || 0; + var y = parseFloat(target.getAttribute("data-bs-y")) || 0; // check if control key is pressed if (event.ctrlKey) { - const aspectRatio = target.offsetWidth / target.offsetHeight; - // preserve aspect ratio - let width = event.rect.width; - let height = event.rect.height; + const aspectRatio = target.offsetWidth / target.offsetHeight; + // preserve aspect ratio + let width = event.rect.width; + let height = event.rect.height; - if (Math.abs(event.deltaRect.width) >= Math.abs(event.deltaRect.height)) { - height = width / aspectRatio; - } else { - width = height * aspectRatio; - } + if (Math.abs(event.deltaRect.width) >= Math.abs(event.deltaRect.height)) { + height = width / aspectRatio; + } else { + width = height * aspectRatio; + } - event.rect.width = width; - event.rect.height = height; + event.rect.width = width; + event.rect.height = height; } - target.style.width = event.rect.width + 'px' - target.style.height = event.rect.height + 'px' + target.style.width = event.rect.width + "px"; + target.style.height = event.rect.height + "px"; // translate when resizing from top or left edges - x += event.deltaRect.left - y += event.deltaRect.top + x += event.deltaRect.left; + y += event.deltaRect.top; - target.style.transform = 'translate(' + x + 'px,' + y + 'px)' + target.style.transform = "translate(" + x + "px," + y + "px)"; - target.setAttribute('data-bs-x', x) - target.setAttribute('data-bs-y', y) - target.textContent = Math.round(event.rect.width) + '\u00D7' + Math.round(event.rect.height) + target.setAttribute("data-bs-x", x); + target.setAttribute("data-bs-y", y); + target.textContent = Math.round(event.rect.width) + "\u00D7" + Math.round(event.rect.height); this.onInteraction(target); + }, }, - }, - modifiers: [ - interact.modifiers.restrictSize({ - min: { width: 5, height: 5 }, - }), - ], - inertia: true, - }); - }, - onInteraction(target) { - this.boxDragContainer.appendChild(target); - }, + modifiers: [ + interact.modifiers.restrictSize({ + min: { width: 5, height: 5 }, + }), + ], + inertia: true, + }); + }, + onInteraction(target) { + this.boxDragContainer.appendChild(target); + }, - createDraggableCanvas() { - const createdCanvas = document.createElement('canvas'); - createdCanvas.id = `draggable-canvas-${this.nextId++}`; - createdCanvas.classList.add("draggable-canvas"); + createDraggableCanvas() { + const createdCanvas = document.createElement("canvas"); + createdCanvas.id = `draggable-canvas-${this.nextId++}`; + createdCanvas.classList.add("draggable-canvas"); - const x = 0; - const y = 20; - createdCanvas.style.transform = `translate(${x}px, ${y}px)`; - createdCanvas.setAttribute('data-bs-x', x); - createdCanvas.setAttribute('data-bs-y', y); + const x = 0; + const y = 20; + createdCanvas.style.transform = `translate(${x}px, ${y}px)`; + createdCanvas.setAttribute("data-bs-x", x); + createdCanvas.setAttribute("data-bs-y", y); - createdCanvas.onclick = e => this.onInteraction(e.target); + createdCanvas.onclick = (e) => this.onInteraction(e.target); - this.boxDragContainer.appendChild(createdCanvas); - return createdCanvas; - }, - createDraggableCanvasFromUrl(dataUrl) { - return new Promise((resolve) => { - var myImage = new Image(); - myImage.src = dataUrl; - myImage.onload = () => { - var createdCanvas = this.createDraggableCanvas(); + this.boxDragContainer.appendChild(createdCanvas); + return createdCanvas; + }, + createDraggableCanvasFromUrl(dataUrl) { + return new Promise((resolve) => { + var myImage = new Image(); + myImage.src = dataUrl; + myImage.onload = () => { + var createdCanvas = this.createDraggableCanvas(); - createdCanvas.width = myImage.width; - createdCanvas.height = myImage.height; + createdCanvas.width = myImage.width; + createdCanvas.height = myImage.height; - const imgAspect = myImage.width / myImage.height; - const pdfAspect = this.boxDragContainer.offsetWidth / this.boxDragContainer.offsetHeight; + const imgAspect = myImage.width / myImage.height; + const pdfAspect = this.boxDragContainer.offsetWidth / this.boxDragContainer.offsetHeight; - var scaleMultiplier; - if (imgAspect > pdfAspect) { - scaleMultiplier = this.boxDragContainer.offsetWidth / myImage.width; - } else { - scaleMultiplier = this.boxDragContainer.offsetHeight / myImage.height; - } - - var newWidth = createdCanvas.width; - var newHeight = createdCanvas.height; - if (scaleMultiplier < 1) { - newWidth = newWidth * scaleMultiplier; - newHeight = newHeight * scaleMultiplier; - } - - createdCanvas.style.width = newWidth+"px"; - createdCanvas.style.height = newHeight+"px"; - - var myContext = createdCanvas.getContext("2d"); - myContext.drawImage(myImage,0,0); - resolve(createdCanvas); - } - }) - }, - deleteAllDraggableCanvases() { - this.boxDragContainer.querySelectorAll(".draggable-canvas").forEach(el => el.remove()); - }, - deleteDraggableCanvas(element) { - if (element) { - element.remove(); - } - }, - getLastInteracted() { - return this.boxDragContainer.querySelector(".draggable-canvas:last-of-type"); - }, - - storePageContents() { - var pagesMap = this.documentsMap.get(this.pdfDoc); - if (!pagesMap) { - pagesMap = {}; - } - - const elements = [...this.boxDragContainer.querySelectorAll(".draggable-canvas")]; - const draggablesData = elements.map(el => {return{element:el, offsetWidth:el.offsetWidth, offsetHeight:el.offsetHeight}}); - elements.forEach(el => this.boxDragContainer.removeChild(el)); - - pagesMap[this.pageIndex] = draggablesData; - pagesMap[this.pageIndex+"-offsetWidth"] = this.pdfCanvas.offsetWidth; - pagesMap[this.pageIndex+"-offsetHeight"] = this.pdfCanvas.offsetHeight; - - this.documentsMap.set(this.pdfDoc, pagesMap); - }, - loadPageContents() { - var pagesMap = this.documentsMap.get(this.pdfDoc); - this.deleteAllDraggableCanvases(); - if (!pagesMap) { - return; - } - - const draggablesData = pagesMap[this.pageIndex]; - if (draggablesData) { - draggablesData.forEach(draggableData => this.boxDragContainer.appendChild(draggableData.element)); - } - - this.documentsMap.set(this.pdfDoc, pagesMap); - }, - - async renderPage(pdfDocument, pageIdx) { - this.pdfDoc = pdfDocument ? pdfDocument : this.pdfDoc; - this.pageIndex = pageIdx; - - // persist - const page = await this.pdfDoc.getPage(this.pageIndex+1); - - // set the canvas size to the size of the page - if (page.rotate == 90 || page.rotate == 270) { - this.pdfCanvas.width = page.view[3]; - this.pdfCanvas.height = page.view[2]; + var scaleMultiplier; + if (imgAspect > pdfAspect) { + scaleMultiplier = this.boxDragContainer.offsetWidth / myImage.width; } else { - this.pdfCanvas.width = page.view[2]; - this.pdfCanvas.height = page.view[3]; + scaleMultiplier = this.boxDragContainer.offsetHeight / myImage.height; } - // render the page onto the canvas - var renderContext = { - canvasContext: this.pdfCanvas.getContext("2d"), - viewport: page.getViewport({ scale: 1 }) + var newWidth = createdCanvas.width; + var newHeight = createdCanvas.height; + if (scaleMultiplier < 1) { + newWidth = newWidth * scaleMultiplier; + newHeight = newHeight * scaleMultiplier; + } + + createdCanvas.style.width = newWidth + "px"; + createdCanvas.style.height = newHeight + "px"; + + var myContext = createdCanvas.getContext("2d"); + myContext.drawImage(myImage, 0, 0); + resolve(createdCanvas); + }; + }); + }, + deleteAllDraggableCanvases() { + this.boxDragContainer.querySelectorAll(".draggable-canvas").forEach((el) => el.remove()); + }, + deleteDraggableCanvas(element) { + if (element) { + element.remove(); + } + }, + getLastInteracted() { + return this.boxDragContainer.querySelector(".draggable-canvas:last-of-type"); + }, + + storePageContents() { + var pagesMap = this.documentsMap.get(this.pdfDoc); + if (!pagesMap) { + pagesMap = {}; + } + + const elements = [...this.boxDragContainer.querySelectorAll(".draggable-canvas")]; + const draggablesData = elements.map((el) => { + return { + element: el, + offsetWidth: el.offsetWidth, + offsetHeight: el.offsetHeight, + }; + }); + elements.forEach((el) => this.boxDragContainer.removeChild(el)); + + pagesMap[this.pageIndex] = draggablesData; + pagesMap[this.pageIndex + "-offsetWidth"] = this.pdfCanvas.offsetWidth; + pagesMap[this.pageIndex + "-offsetHeight"] = this.pdfCanvas.offsetHeight; + + this.documentsMap.set(this.pdfDoc, pagesMap); + }, + loadPageContents() { + var pagesMap = this.documentsMap.get(this.pdfDoc); + this.deleteAllDraggableCanvases(); + if (!pagesMap) { + return; + } + + const draggablesData = pagesMap[this.pageIndex]; + if (draggablesData) { + draggablesData.forEach((draggableData) => this.boxDragContainer.appendChild(draggableData.element)); + } + + this.documentsMap.set(this.pdfDoc, pagesMap); + }, + + async renderPage(pdfDocument, pageIdx) { + this.pdfDoc = pdfDocument ? pdfDocument : this.pdfDoc; + this.pageIndex = pageIdx; + + // persist + const page = await this.pdfDoc.getPage(this.pageIndex + 1); + + // set the canvas size to the size of the page + if (page.rotate == 90 || page.rotate == 270) { + this.pdfCanvas.width = page.view[3]; + this.pdfCanvas.height = page.view[2]; + } else { + this.pdfCanvas.width = page.view[2]; + this.pdfCanvas.height = page.view[3]; + } + + // render the page onto the canvas + var renderContext = { + canvasContext: this.pdfCanvas.getContext("2d"), + viewport: page.getViewport({ scale: 1 }), + }; + await page.render(renderContext).promise; + + //return pdfCanvas.toDataURL(); + }, + async incrementPage() { + if (this.pageIndex < this.pdfDoc.numPages - 1) { + this.storePageContents(); + await this.renderPage(this.pdfDoc, this.pageIndex + 1); + this.loadPageContents(); + } + }, + async decrementPage() { + if (this.pageIndex > 0) { + this.storePageContents(); + await this.renderPage(this.pdfDoc, this.pageIndex - 1); + this.loadPageContents(); + } + }, + + parseTransform(element) {}, + async getOverlayedPdfDocument() { + const pdfBytes = await this.pdfDoc.getData(); + const pdfDocModified = await PDFLib.PDFDocument.load(pdfBytes, { + ignoreEncryption: true, + }); + this.storePageContents(); + + const pagesMap = this.documentsMap.get(this.pdfDoc); + for (let pageIdx in pagesMap) { + if (pageIdx.includes("offset")) { + continue; + } + console.log(typeof pageIdx); + + const page = pdfDocModified.getPage(parseInt(pageIdx)); + const draggablesData = pagesMap[pageIdx]; + const offsetWidth = pagesMap[pageIdx + "-offsetWidth"]; + const offsetHeight = pagesMap[pageIdx + "-offsetHeight"]; + + for (const draggableData of draggablesData) { + // embed the draggable canvas + const draggableElement = draggableData.element; + const response = await fetch(draggableElement.toDataURL()); + const draggableImgBytes = await response.arrayBuffer(); + const pdfImageObject = await pdfDocModified.embedPng(draggableImgBytes); + + // calculate the position in the pdf document + const tansform = draggableElement.style.transform.replace(/[^.,-\d]/g, ""); + const transformComponents = tansform.split(","); + const draggablePositionPixels = { + x: parseFloat(transformComponents[0]), + y: parseFloat(transformComponents[1]), + width: draggableData.offsetWidth, + height: draggableData.offsetHeight, + }; + const draggablePositionRelative = { + x: draggablePositionPixels.x / offsetWidth, + y: draggablePositionPixels.y / offsetHeight, + width: draggablePositionPixels.width / offsetWidth, + height: draggablePositionPixels.height / offsetHeight, + }; + const draggablePositionPdf = { + x: draggablePositionRelative.x * page.getWidth(), + y: draggablePositionRelative.y * page.getHeight(), + width: draggablePositionRelative.width * page.getWidth(), + height: draggablePositionRelative.height * page.getHeight(), }; - await page.render(renderContext).promise; - //return pdfCanvas.toDataURL(); - }, - async incrementPage() { - if (this.pageIndex < this.pdfDoc.numPages-1) { - this.storePageContents(); - await this.renderPage(this.pdfDoc, this.pageIndex+1); - this.loadPageContents(); - } - }, - async decrementPage() { - if (this.pageIndex > 0) { - this.storePageContents(); - await this.renderPage(this.pdfDoc, this.pageIndex-1); - this.loadPageContents(); - } - }, + // draw the image + page.drawImage(pdfImageObject, { + x: draggablePositionPdf.x, + y: page.getHeight() - draggablePositionPdf.y - draggablePositionPdf.height, + width: draggablePositionPdf.width, + height: draggablePositionPdf.height, + }); + } + } - parseTransform(element) { - - }, - async getOverlayedPdfDocument() { - const pdfBytes = await this.pdfDoc.getData(); - const pdfDocModified = await PDFLib.PDFDocument.load(pdfBytes, { ignoreEncryption: true }); - this.storePageContents(); - - const pagesMap = this.documentsMap.get(this.pdfDoc); - for (let pageIdx in pagesMap) { - if (pageIdx.includes("offset")) { - continue; - } - console.log(typeof pageIdx); - - const page = pdfDocModified.getPage(parseInt(pageIdx)); - const draggablesData = pagesMap[pageIdx]; - const offsetWidth = pagesMap[pageIdx+"-offsetWidth"]; - const offsetHeight = pagesMap[pageIdx+"-offsetHeight"]; - - for (const draggableData of draggablesData) { - // embed the draggable canvas - const draggableElement = draggableData.element; - const response = await fetch(draggableElement.toDataURL()); - const draggableImgBytes = await response.arrayBuffer(); - const pdfImageObject = await pdfDocModified.embedPng(draggableImgBytes); - - // calculate the position in the pdf document - const tansform = draggableElement.style.transform.replace(/[^.,-\d]/g, ''); - const transformComponents = tansform.split(","); - const draggablePositionPixels = { - x: parseFloat(transformComponents[0]), - y: parseFloat(transformComponents[1]), - width: draggableData.offsetWidth, - height: draggableData.offsetHeight, - }; - const draggablePositionRelative = { - x: draggablePositionPixels.x / offsetWidth, - y: draggablePositionPixels.y / offsetHeight, - width: draggablePositionPixels.width / offsetWidth, - height: draggablePositionPixels.height / offsetHeight, - } - const draggablePositionPdf = { - x: draggablePositionRelative.x * page.getWidth(), - y: draggablePositionRelative.y * page.getHeight(), - width: draggablePositionRelative.width * page.getWidth(), - height: draggablePositionRelative.height * page.getHeight(), - } - - // draw the image - page.drawImage(pdfImageObject, { - x: draggablePositionPdf.x, - y: page.getHeight() - draggablePositionPdf.y - draggablePositionPdf.height, - width: draggablePositionPdf.width, - height: draggablePositionPdf.height, - }); - } - } - - this.loadPageContents(); - return pdfDocModified; - }, -} + this.loadPageContents(); + return pdfDocModified; + }, +}; document.addEventListener("DOMContentLoaded", () => { - DraggableUtils.init(); + DraggableUtils.init(); }); diff --git a/src/main/resources/static/js/errorBanner.js b/src/main/resources/static/js/errorBanner.js index 9d151407..727a854f 100644 --- a/src/main/resources/static/js/errorBanner.js +++ b/src/main/resources/static/js/errorBanner.js @@ -1,50 +1,50 @@ var traceVisible = false; function toggletrace() { - var traceDiv = document.getElementById("trace"); - if (!traceVisible) { - traceDiv.style.maxHeight = "500px"; - traceVisible = true; - } else { - traceDiv.style.maxHeight = "0px"; - traceVisible = false; - } - adjustContainerHeight(); + var traceDiv = document.getElementById("trace"); + if (!traceVisible) { + traceDiv.style.maxHeight = "500px"; + traceVisible = true; + } else { + traceDiv.style.maxHeight = "0px"; + traceVisible = false; + } + adjustContainerHeight(); } function copytrace() { - var flip = false - if (!traceVisible) { - toggletrace() - flip = true - } - var traceContent = document.getElementById("traceContent"); - var range = document.createRange(); - range.selectNode(traceContent); - window.getSelection().removeAllRanges(); - window.getSelection().addRange(range); - document.execCommand("copy"); - window.getSelection().removeAllRanges(); - if (flip) { - toggletrace() - } + var flip = false; + if (!traceVisible) { + toggletrace(); + flip = true; + } + var traceContent = document.getElementById("traceContent"); + var range = document.createRange(); + range.selectNode(traceContent); + window.getSelection().removeAllRanges(); + window.getSelection().addRange(range); + document.execCommand("copy"); + window.getSelection().removeAllRanges(); + if (flip) { + toggletrace(); + } } function dismissError() { - var errorContainer = document.getElementById("errorContainer"); - errorContainer.style.display = "none"; - errorContainer.style.height = "0"; + var errorContainer = document.getElementById("errorContainer"); + errorContainer.style.display = "none"; + errorContainer.style.height = "0"; } function adjustContainerHeight() { - var errorContainer = document.getElementById("errorContainer"); - var traceDiv = document.getElementById("trace"); - if (traceVisible) { - errorContainer.style.height = errorContainer.scrollHeight - traceDiv.scrollHeight + traceDiv.offsetHeight + "px"; - } else { - errorContainer.style.height = "auto"; - } + var errorContainer = document.getElementById("errorContainer"); + var traceDiv = document.getElementById("trace"); + if (traceVisible) { + errorContainer.style.height = errorContainer.scrollHeight - traceDiv.scrollHeight + traceDiv.offsetHeight + "px"; + } else { + errorContainer.style.height = "auto"; + } } function showHelp() { - $('#helpModal').modal('show'); -} \ No newline at end of file + $("#helpModal").modal("show"); +} diff --git a/src/main/resources/static/js/favourites.js b/src/main/resources/static/js/favourites.js index 08c6f183..dbecd013 100644 --- a/src/main/resources/static/js/favourites.js +++ b/src/main/resources/static/js/favourites.js @@ -1,45 +1,45 @@ function updateFavoritesDropdown() { - var dropdown = document.querySelector('#favoritesDropdown'); + var dropdown = document.querySelector("#favoritesDropdown"); - // Check if dropdown exists - if (!dropdown) { - console.error('Dropdown element with ID "favoritesDropdown" not found!'); - return; // Exit the function + // Check if dropdown exists + if (!dropdown) { + console.error('Dropdown element with ID "favoritesDropdown" not found!'); + return; // Exit the function + } + dropdown.innerHTML = ""; // Clear the current favorites + + var hasFavorites = false; + + for (var i = 0; i < localStorage.length; i++) { + var key = localStorage.key(i); + if (localStorage.getItem(key) === "favorite") { + // Find the corresponding navbar entry + var navbarEntry = document.querySelector(`a[href='${key}']`); + if (navbarEntry) { + // Create a new dropdown entry + var dropdownItem = document.createElement("a"); + dropdownItem.className = "dropdown-item"; + dropdownItem.href = navbarEntry.href; + dropdownItem.innerHTML = navbarEntry.innerHTML; + dropdown.appendChild(dropdownItem); + hasFavorites = true; + } else { + console.warn(`Navbar entry not found for key: ${key}`); + } } - dropdown.innerHTML = ''; // Clear the current favorites + } - var hasFavorites = false; - - for (var i = 0; i < localStorage.length; i++) { - var key = localStorage.key(i); - if (localStorage.getItem(key) === 'favorite') { - // Find the corresponding navbar entry - var navbarEntry = document.querySelector(`a[href='${key}']`); - if (navbarEntry) { - // Create a new dropdown entry - var dropdownItem = document.createElement('a'); - dropdownItem.className = 'dropdown-item'; - dropdownItem.href = navbarEntry.href; - dropdownItem.innerHTML = navbarEntry.innerHTML; - dropdown.appendChild(dropdownItem); - hasFavorites = true; - } else { - console.warn(`Navbar entry not found for key: ${key}`); - } - } - } - - // Show or hide the default item based on whether there are any favorites - if (!hasFavorites) { - var defaultItem = document.createElement('a'); - defaultItem.className = 'dropdown-item'; - defaultItem.textContent = noFavourites; - dropdown.appendChild(defaultItem); - } + // Show or hide the default item based on whether there are any favorites + if (!hasFavorites) { + var defaultItem = document.createElement("a"); + defaultItem.className = "dropdown-item"; + defaultItem.textContent = noFavourites; + dropdown.appendChild(defaultItem); + } } // Ensure that the DOM content has been fully loaded before calling the function -document.addEventListener('DOMContentLoaded', function() { - console.log('DOMContentLoaded event fired'); - updateFavoritesDropdown(); +document.addEventListener("DOMContentLoaded", function () { + console.log("DOMContentLoaded event fired"); + updateFavoritesDropdown(); }); diff --git a/src/main/resources/static/js/fileInput.js b/src/main/resources/static/js/fileInput.js index 610ae723..89ad1ad9 100644 --- a/src/main/resources/static/js/fileInput.js +++ b/src/main/resources/static/js/fileInput.js @@ -1,104 +1,107 @@ -document.addEventListener('DOMContentLoaded', function() { - document.querySelectorAll('.custom-file-chooser').forEach(setupFileInput); +document.addEventListener("DOMContentLoaded", function () { + document.querySelectorAll(".custom-file-chooser").forEach(setupFileInput); }); function setupFileInput(chooser) { - const elementId = chooser.getAttribute('data-bs-element-id'); - const filesSelected = chooser.getAttribute('data-bs-files-selected'); - const pdfPrompt = chooser.getAttribute('data-bs-pdf-prompt'); + const elementId = chooser.getAttribute("data-bs-element-id"); + const filesSelected = chooser.getAttribute("data-bs-files-selected"); + const pdfPrompt = chooser.getAttribute("data-bs-pdf-prompt"); - let allFiles = []; - let overlay; - let dragCounter = 0; + let allFiles = []; + let overlay; + let dragCounter = 0; - const dragenterListener = function() { - dragCounter++; - if (!overlay) { - overlay = document.createElement('div'); - overlay.style.position = 'fixed'; - overlay.style.top = 0; - overlay.style.left = 0; - overlay.style.width = '100%'; - overlay.style.height = '100%'; - overlay.style.background = 'rgba(0, 0, 0, 0.5)'; - overlay.style.color = '#fff'; - overlay.style.zIndex = '1000'; - overlay.style.display = 'flex'; - overlay.style.alignItems = 'center'; - overlay.style.justifyContent = 'center'; - overlay.style.pointerEvents = 'none'; - overlay.innerHTML = '

Drop files anywhere to upload

'; - document.getElementById('content-wrap').appendChild(overlay); - } - }; + const dragenterListener = function () { + dragCounter++; + if (!overlay) { + overlay = document.createElement("div"); + overlay.style.position = "fixed"; + overlay.style.top = 0; + overlay.style.left = 0; + overlay.style.width = "100%"; + overlay.style.height = "100%"; + overlay.style.background = "rgba(0, 0, 0, 0.5)"; + overlay.style.color = "#fff"; + overlay.style.zIndex = "1000"; + overlay.style.display = "flex"; + overlay.style.alignItems = "center"; + overlay.style.justifyContent = "center"; + overlay.style.pointerEvents = "none"; + overlay.innerHTML = "

Drop files anywhere to upload

"; + document.getElementById("content-wrap").appendChild(overlay); + } + }; - const dragleaveListener = function() { - dragCounter--; - if (dragCounter === 0) { - if (overlay) { - overlay.remove(); - overlay = null; - } - } - }; + const dragleaveListener = function () { + dragCounter--; + if (dragCounter === 0) { + if (overlay) { + overlay.remove(); + overlay = null; + } + } + }; - const dropListener = function(e) { - e.preventDefault(); - const dt = e.dataTransfer; - const files = dt.files; + const dropListener = function (e) { + e.preventDefault(); + const dt = e.dataTransfer; + const files = dt.files; - for (let i = 0; i < files.length; i++) { - allFiles.push(files[i]); - } + for (let i = 0; i < files.length; i++) { + allFiles.push(files[i]); + } - const dataTransfer = new DataTransfer(); - allFiles.forEach(file => dataTransfer.items.add(file)); + const dataTransfer = new DataTransfer(); + allFiles.forEach((file) => dataTransfer.items.add(file)); - const fileInput = document.getElementById(elementId); - fileInput.files = dataTransfer.files; + const fileInput = document.getElementById(elementId); + fileInput.files = dataTransfer.files; - if (overlay) { - overlay.remove(); - overlay = null; - } + if (overlay) { + overlay.remove(); + overlay = null; + } - dragCounter = 0; + dragCounter = 0; - fileInput.dispatchEvent(new Event('change', { bubbles: true })); - }; + fileInput.dispatchEvent(new Event("change", { bubbles: true })); + }; - ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => { - document.body.addEventListener(eventName, preventDefaults, false); + ["dragenter", "dragover", "dragleave", "drop"].forEach((eventName) => { + document.body.addEventListener(eventName, preventDefaults, false); + }); + + function preventDefaults(e) { + e.preventDefault(); + e.stopPropagation(); + } + + document.body.addEventListener("dragenter", dragenterListener); + document.body.addEventListener("dragleave", dragleaveListener); + document.body.addEventListener("drop", dropListener); + + $("#" + elementId).on("change", function (e) { + allFiles = Array.from(e.target.files); + handleFileInputChange(this); + }); + + function handleFileInputChange(inputElement) { + const files = allFiles; + const fileNames = files.map((f) => f.name); + const selectedFilesContainer = $(inputElement).siblings(".selected-files"); + selectedFilesContainer.empty(); + fileNames.forEach((fileName) => { + selectedFilesContainer.append("
" + fileName + "
"); }); - - function preventDefaults(e) { - e.preventDefault(); - e.stopPropagation(); - } - - document.body.addEventListener('dragenter', dragenterListener); - document.body.addEventListener('dragleave', dragleaveListener); - document.body.addEventListener('drop', dropListener); - - $("#" + elementId).on("change", function(e) { - allFiles = Array.from(e.target.files); - handleFileInputChange(this); - }); - - function handleFileInputChange(inputElement) { - const files = allFiles; - const fileNames = files.map(f => f.name); - const selectedFilesContainer = $(inputElement).siblings(".selected-files"); - selectedFilesContainer.empty(); - fileNames.forEach(fileName => { - selectedFilesContainer.append("
" + fileName + "
"); - }); - if (fileNames.length === 1) { - $(inputElement).siblings(".custom-file-label").addClass("selected").html(fileNames[0]); - } else if (fileNames.length > 1) { - $(inputElement).siblings(".custom-file-label").addClass("selected").html(fileNames.length + " " + filesSelected); - } else { - $(inputElement).siblings(".custom-file-label").addClass("selected").html(pdfPrompt); - } + if (fileNames.length === 1) { + $(inputElement).siblings(".custom-file-label").addClass("selected").html(fileNames[0]); + } else if (fileNames.length > 1) { + $(inputElement) + .siblings(".custom-file-label") + .addClass("selected") + .html(fileNames.length + " " + filesSelected); + } else { + $(inputElement).siblings(".custom-file-label").addClass("selected").html(pdfPrompt); } + } } diff --git a/src/main/resources/static/js/game.js b/src/main/resources/static/js/game.js index 1bfb9374..199bab0f 100644 --- a/src/main/resources/static/js/game.js +++ b/src/main/resources/static/js/game.js @@ -1,292 +1,265 @@ function initializeGame() { - const gameContainer = document.getElementById('game-container'); - const player = document.getElementById('player'); + const gameContainer = document.getElementById("game-container"); + const player = document.getElementById("player"); - let playerSize = gameContainer.clientWidth * 0.0625; // 5% of container width - player.style.width = playerSize + 'px'; - player.style.height = playerSize + 'px'; + let playerSize = gameContainer.clientWidth * 0.0625; // 5% of container width + player.style.width = playerSize + "px"; + player.style.height = playerSize + "px"; - let playerX = gameContainer.clientWidth / 2 - playerSize / 2; - let playerY = gameContainer.clientHeight * 0.1; - const scoreElement = document.getElementById('score'); - const levelElement = document.getElementById('level'); - const livesElement = document.getElementById('lives'); - const highScoreElement = document.getElementById('high-score'); + let playerX = gameContainer.clientWidth / 2 - playerSize / 2; + let playerY = gameContainer.clientHeight * 0.1; + const scoreElement = document.getElementById("score"); + const levelElement = document.getElementById("level"); + const livesElement = document.getElementById("lives"); + const highScoreElement = document.getElementById("high-score"); - let pdfSize = gameContainer.clientWidth * 0.0625; // 5% of container width - let projectileWidth = gameContainer.clientWidth * 0.00625;// 0.00625; // 0.5% of container width - let projectileHeight = gameContainer.clientHeight * 0.01667; // 1% of container height + let pdfSize = gameContainer.clientWidth * 0.0625; // 5% of container width + let projectileWidth = gameContainer.clientWidth * 0.00625; // 0.00625; // 0.5% of container width + let projectileHeight = gameContainer.clientHeight * 0.01667; // 1% of container height - let paused = false; + let paused = false; - const fireRate = 200; // Time between shots in milliseconds - let lastProjectileTime = 0; - let lives = 3; + const fireRate = 200; // Time between shots in milliseconds + let lastProjectileTime = 0; + let lives = 3; + let highScore = localStorage.getItem("highScore") ? parseInt(localStorage.getItem("highScore")) : 0; + updateHighScore(); - let highScore = localStorage.getItem('highScore') ? parseInt(localStorage.getItem('highScore')) : 0; - updateHighScore(); + const keysPressed = {}; + const pdfs = []; + const projectiles = []; + let score = 0; + let level = 1; + let pdfSpeed = 0.5; + let gameOver = false; - - - const keysPressed = {}; - const pdfs = []; - const projectiles = []; - let score = 0; - let level = 1; - let pdfSpeed = 0.5; - let gameOver = false; - - function handleKeys() { - if (keysPressed['ArrowLeft']) { - playerX -= 10; - } - if (keysPressed['ArrowRight']) { - playerX += 10; - } - if (keysPressed[' '] && !gameOver) { - const currentTime = new Date().getTime(); - if (currentTime - lastProjectileTime >= fireRate) { - shootProjectile(); - lastProjectileTime = currentTime; - } - } - updatePlayerPosition(); - } - - - - - document.addEventListener('keydown', (event) => { - if (event.key === ' ') { - event.preventDefault(); - } - keysPressed[event.key] = true; - handleKeys(); - }); - - document.addEventListener('keyup', (event) => { - keysPressed[event.key] = false; - }); - - - function updatePlayerPosition() { - player.style.left = playerX + 'px'; - player.style.bottom = playerY + 'px'; + function handleKeys() { + if (keysPressed["ArrowLeft"]) { + playerX -= 10; } - - function updateLives() { - livesElement.textContent = 'Lives: ' + lives; + if (keysPressed["ArrowRight"]) { + playerX += 10; } - - function updateHighScore() { - highScoreElement.textContent = 'High Score: ' + highScore; + if (keysPressed[" "] && !gameOver) { + const currentTime = new Date().getTime(); + if (currentTime - lastProjectileTime >= fireRate) { + shootProjectile(); + lastProjectileTime = currentTime; + } } - - - function shootProjectile() { - const projectile = document.createElement('div'); - projectile.classList.add('projectile'); - projectile.style.backgroundColor = 'black'; - projectile.style.width = projectileWidth + 'px'; - projectile.style.height = projectileHeight + 'px'; - projectile.style.left = (playerX + playerSize / 2 - projectileWidth / 2) + 'px'; - projectile.style.top = (gameContainer.clientHeight - playerY - playerSize) + 'px'; - gameContainer.appendChild(projectile); - projectiles.push(projectile); - } - - - - function spawnPdf() { - const pdf = document.createElement('img'); - pdf.src = 'images/file-earmark-pdf.svg'; - pdf.classList.add('pdf'); - pdf.style.width = pdfSize + 'px'; - pdf.style.height = pdfSize + 'px'; - pdf.style.left = Math.floor(Math.random() * (gameContainer.clientWidth - pdfSize)) + 'px'; - pdf.style.top = '0px'; - gameContainer.appendChild(pdf); - pdfs.push(pdf); - } - - - function resetEnemies() { - pdfs.forEach((pdf) => gameContainer.removeChild(pdf)); - pdfs.length = 0; - } - - - function updateGame() { - if (gameOver || paused) return; - - for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) { - const pdf = pdfs[pdfIndex]; - const pdfY = parseFloat(pdf.style.top) + pdfSpeed; - if (pdfY + 50 > gameContainer.clientHeight) { - gameContainer.removeChild(pdf); - pdfs.splice(pdfIndex, 1); - - // Deduct 2 points when a PDF gets past the player - score -= 0; - updateScore(); - - // Decrease lives and check if game over - lives--; - updateLives(); - if (lives <= 0) { - endGame(); - return; - } - - } else { - pdf.style.top = pdfY + 'px'; - - // Check for collision with player - if (collisionDetected(player, pdf)) { - lives--; - updateLives(); - resetEnemies(); - if (lives <= 0) { - endGame(); - return; - } - } - } - }; - - projectiles.forEach((projectile, projectileIndex) => { - const projectileY = parseInt(projectile.style.top) - 10; - if (projectileY < 0) { - gameContainer.removeChild(projectile); - projectiles.splice(projectileIndex, 1); - } else { - projectile.style.top = projectileY + 'px'; - } - - for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) { - const pdf = pdfs[pdfIndex]; - if (collisionDetected(projectile, pdf)) { - gameContainer.removeChild(pdf); - gameContainer.removeChild(projectile); - pdfs.splice(pdfIndex, 1); - projectiles.splice(projectileIndex, 1); - score = score + 10; - updateScore(); - break; - } - } - }); - - setTimeout(updateGame, 1000 / 60); - } - - function resetGame() { - playerX = gameContainer.clientWidth / 2; - playerY = 50; - updatePlayerPosition(); - - pdfs.forEach((pdf) => gameContainer.removeChild(pdf)); - projectiles.forEach((projectile) => gameContainer.removeChild(projectile)); - - pdfs.length = 0; - projectiles.length = 0; - - score = 0; - level = 1; - lives = 3; - - gameOver = false; - - updateScore(); - updateLives(); - levelElement.textContent = 'Level: ' + level; - pdfSpeed = 1; - clearTimeout(spawnPdfTimeout); // Clear the existing spawnPdfTimeout - setTimeout(updateGame, 1000 / 60); - spawnPdfInterval(); - } - - - - function updateScore() { - scoreElement.textContent = 'Score: ' + score; - checkLevelUp(); - } - - - - function checkLevelUp() { - const newLevel = Math.floor(score / 100) + 1; - if (newLevel > level) { - level = newLevel; - levelElement.textContent = 'Level: ' + level; - pdfSpeed += 0.2; - } - } - - function collisionDetected(a, b) { - const rectA = a.getBoundingClientRect(); - const rectB = b.getBoundingClientRect(); - return ( - rectA.left < rectB.right && - rectA.right > rectB.left && - rectA.top < rectB.bottom && - rectA.bottom > rectB.top - ); - } - - function endGame() { - gameOver = true; - if (score > highScore) { - highScore = score; - localStorage.setItem('highScore', highScore); - updateHighScore(); - } - alert('Game Over! Your final score is: ' + score); - document.getElementById('game-container-wrapper').close(); - } - - - - - let spawnPdfTimeout; - - const BASE_SPAWN_INTERVAL_MS = 1250; // milliseconds before a new enemy spawns - const LEVEL_INCREASE_FACTOR_MS = 0; // milliseconds to decrease the spawn interval per level - const MAX_SPAWN_RATE_REDUCTION_MS = 800; // Max milliseconds from the base spawn interval - - function spawnPdfInterval() { - console.log("spawnPdfInterval"); - if (gameOver || paused) { - console.log("spawnPdfInterval 2"); - clearTimeout(spawnPdfTimeout); - return; - } - console.log("spawnPdfInterval 3"); - spawnPdf(); - let spawnRateReduction = Math.min(level * LEVEL_INCREASE_FACTOR_MS, MAX_SPAWN_RATE_REDUCTION_MS); - let spawnRate = BASE_SPAWN_INTERVAL_MS - spawnRateReduction; - spawnPdfTimeout = setTimeout(spawnPdfInterval, spawnRate); - } - updatePlayerPosition(); - updateGame(); - spawnPdfInterval(); + } + document.addEventListener("keydown", (event) => { + if (event.key === " ") { + event.preventDefault(); + } + keysPressed[event.key] = true; + handleKeys(); + }); - document.addEventListener('visibilitychange', function() { - if (document.hidden) { - paused = true; - } else { - paused = false; - updateGame(); - spawnPdfInterval(); + document.addEventListener("keyup", (event) => { + keysPressed[event.key] = false; + }); + + function updatePlayerPosition() { + player.style.left = playerX + "px"; + player.style.bottom = playerY + "px"; + } + + function updateLives() { + livesElement.textContent = "Lives: " + lives; + } + + function updateHighScore() { + highScoreElement.textContent = "High Score: " + highScore; + } + + function shootProjectile() { + const projectile = document.createElement("div"); + projectile.classList.add("projectile"); + projectile.style.backgroundColor = "black"; + projectile.style.width = projectileWidth + "px"; + projectile.style.height = projectileHeight + "px"; + projectile.style.left = playerX + playerSize / 2 - projectileWidth / 2 + "px"; + projectile.style.top = gameContainer.clientHeight - playerY - playerSize + "px"; + gameContainer.appendChild(projectile); + projectiles.push(projectile); + } + + function spawnPdf() { + const pdf = document.createElement("img"); + pdf.src = "images/file-earmark-pdf.svg"; + pdf.classList.add("pdf"); + pdf.style.width = pdfSize + "px"; + pdf.style.height = pdfSize + "px"; + pdf.style.left = Math.floor(Math.random() * (gameContainer.clientWidth - pdfSize)) + "px"; + pdf.style.top = "0px"; + gameContainer.appendChild(pdf); + pdfs.push(pdf); + } + + function resetEnemies() { + pdfs.forEach((pdf) => gameContainer.removeChild(pdf)); + pdfs.length = 0; + } + + function updateGame() { + if (gameOver || paused) return; + + for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) { + const pdf = pdfs[pdfIndex]; + const pdfY = parseFloat(pdf.style.top) + pdfSpeed; + if (pdfY + 50 > gameContainer.clientHeight) { + gameContainer.removeChild(pdf); + pdfs.splice(pdfIndex, 1); + + // Deduct 2 points when a PDF gets past the player + score -= 0; + updateScore(); + + // Decrease lives and check if game over + lives--; + updateLives(); + if (lives <= 0) { + endGame(); + return; } + } else { + pdf.style.top = pdfY + "px"; + // Check for collision with player + if (collisionDetected(player, pdf)) { + lives--; + updateLives(); + resetEnemies(); + if (lives <= 0) { + endGame(); + return; + } + } + } + } + + projectiles.forEach((projectile, projectileIndex) => { + const projectileY = parseInt(projectile.style.top) - 10; + if (projectileY < 0) { + gameContainer.removeChild(projectile); + projectiles.splice(projectileIndex, 1); + } else { + projectile.style.top = projectileY + "px"; + } + + for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) { + const pdf = pdfs[pdfIndex]; + if (collisionDetected(projectile, pdf)) { + gameContainer.removeChild(pdf); + gameContainer.removeChild(projectile); + pdfs.splice(pdfIndex, 1); + projectiles.splice(projectileIndex, 1); + score = score + 10; + updateScore(); + break; + } + } }); - window.resetGame = resetGame; + setTimeout(updateGame, 1000 / 60); + } + + function resetGame() { + playerX = gameContainer.clientWidth / 2; + playerY = 50; + updatePlayerPosition(); + + pdfs.forEach((pdf) => gameContainer.removeChild(pdf)); + projectiles.forEach((projectile) => gameContainer.removeChild(projectile)); + + pdfs.length = 0; + projectiles.length = 0; + + score = 0; + level = 1; + lives = 3; + + gameOver = false; + + updateScore(); + updateLives(); + levelElement.textContent = "Level: " + level; + pdfSpeed = 1; + clearTimeout(spawnPdfTimeout); // Clear the existing spawnPdfTimeout + setTimeout(updateGame, 1000 / 60); + spawnPdfInterval(); + } + + function updateScore() { + scoreElement.textContent = "Score: " + score; + checkLevelUp(); + } + + function checkLevelUp() { + const newLevel = Math.floor(score / 100) + 1; + if (newLevel > level) { + level = newLevel; + levelElement.textContent = "Level: " + level; + pdfSpeed += 0.2; + } + } + + function collisionDetected(a, b) { + const rectA = a.getBoundingClientRect(); + const rectB = b.getBoundingClientRect(); + return rectA.left < rectB.right && rectA.right > rectB.left && rectA.top < rectB.bottom && rectA.bottom > rectB.top; + } + + function endGame() { + gameOver = true; + if (score > highScore) { + highScore = score; + localStorage.setItem("highScore", highScore); + updateHighScore(); + } + alert("Game Over! Your final score is: " + score); + document.getElementById("game-container-wrapper").close(); + } + + let spawnPdfTimeout; + + const BASE_SPAWN_INTERVAL_MS = 1250; // milliseconds before a new enemy spawns + const LEVEL_INCREASE_FACTOR_MS = 0; // milliseconds to decrease the spawn interval per level + const MAX_SPAWN_RATE_REDUCTION_MS = 800; // Max milliseconds from the base spawn interval + + function spawnPdfInterval() { + console.log("spawnPdfInterval"); + if (gameOver || paused) { + console.log("spawnPdfInterval 2"); + clearTimeout(spawnPdfTimeout); + return; + } + console.log("spawnPdfInterval 3"); + spawnPdf(); + let spawnRateReduction = Math.min(level * LEVEL_INCREASE_FACTOR_MS, MAX_SPAWN_RATE_REDUCTION_MS); + let spawnRate = BASE_SPAWN_INTERVAL_MS - spawnRateReduction; + spawnPdfTimeout = setTimeout(spawnPdfInterval, spawnRate); + } + + updatePlayerPosition(); + updateGame(); + spawnPdfInterval(); + + document.addEventListener("visibilitychange", function () { + if (document.hidden) { + paused = true; + } else { + paused = false; + updateGame(); + spawnPdfInterval(); + } + }); + + window.resetGame = resetGame; } window.initializeGame = initializeGame; diff --git a/src/main/resources/static/js/githubVersion.js b/src/main/resources/static/js/githubVersion.js index 6400d5cf..e17524d5 100644 --- a/src/main/resources/static/js/githubVersion.js +++ b/src/main/resources/static/js/githubVersion.js @@ -1,55 +1,52 @@ function compareVersions(version1, version2) { - const v1 = version1.split('.'); - const v2 = version2.split('.'); + const v1 = version1.split("."); + const v2 = version2.split("."); - for (let i = 0; i < v1.length || i < v2.length; i++) { - const n1 = parseInt(v1[i]) || 0; - const n2 = parseInt(v2[i]) || 0; + for (let i = 0; i < v1.length || i < v2.length; i++) { + const n1 = parseInt(v1[i]) || 0; + const n2 = parseInt(v2[i]) || 0; - if (n1 > n2) { - return 1; - } else if (n1 < n2) { - return -1; - } - } + if (n1 > n2) { + return 1; + } else if (n1 < n2) { + return -1; + } + } - return 0; + return 0; } - async function getLatestReleaseVersion() { - const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest"; - try { - const response = await fetch(url); - const data = await response.json(); - return data.tag_name ? data.tag_name.substring(1) : ""; - } catch (error) { - console.error("Failed to fetch latest version:", error); - return ""; // Return an empty string if the fetch fails - } + const url = "https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest"; + try { + const response = await fetch(url); + const data = await response.json(); + return data.tag_name ? data.tag_name.substring(1) : ""; + } catch (error) { + console.error("Failed to fetch latest version:", error); + return ""; // Return an empty string if the fetch fails + } } async function checkForUpdate() { - // Initialize the update button as hidden - var updateBtn = document.getElementById("update-btn"); - if (updateBtn !== null) { - updateBtn.style.display = "none"; - } + // Initialize the update button as hidden + var updateBtn = document.getElementById("update-btn"); + if (updateBtn !== null) { + updateBtn.style.display = "none"; + } - - const latestVersion = await getLatestReleaseVersion(); - console.log("latestVersion=" + latestVersion) - console.log("currentVersion=" + currentVersion) - console.log("compareVersions(latestVersion, currentVersion) > 0)=" + compareVersions(latestVersion, currentVersion)) - if (latestVersion && compareVersions(latestVersion, currentVersion) > 0) { - document.getElementById("update-btn").style.display = "block"; - console.log("visible") - } else { - console.log("hidden") - } + const latestVersion = await getLatestReleaseVersion(); + console.log("latestVersion=" + latestVersion); + console.log("currentVersion=" + currentVersion); + console.log("compareVersions(latestVersion, currentVersion) > 0)=" + compareVersions(latestVersion, currentVersion)); + if (latestVersion && compareVersions(latestVersion, currentVersion) > 0) { + document.getElementById("update-btn").style.display = "block"; + console.log("visible"); + } else { + console.log("hidden"); + } } - -document.addEventListener('DOMContentLoaded', (event) => { - checkForUpdate(); +document.addEventListener("DOMContentLoaded", (event) => { + checkForUpdate(); }); diff --git a/src/main/resources/static/js/homecard.js b/src/main/resources/static/js/homecard.js index 6fb43387..8ac2ef44 100644 --- a/src/main/resources/static/js/homecard.js +++ b/src/main/resources/static/js/homecard.js @@ -1,78 +1,76 @@ function filterCards() { - var input = document.getElementById('searchBar'); - var filter = input.value.toUpperCase(); - var cards = document.querySelectorAll('.feature-card'); + var input = document.getElementById("searchBar"); + var filter = input.value.toUpperCase(); + var cards = document.querySelectorAll(".feature-card"); - for (var i = 0; i < cards.length; i++) { - var card = cards[i]; - var title = card.querySelector('h5.card-title').innerText; - var text = card.querySelector('p.card-text').innerText; + for (var i = 0; i < cards.length; i++) { + var card = cards[i]; + var title = card.querySelector("h5.card-title").innerText; + var text = card.querySelector("p.card-text").innerText; - // Get the navbar tags associated with the card - var navbarItem = document.querySelector(`a.dropdown-item[href="${card.id}"]`); - var navbarTags = navbarItem ? navbarItem.getAttribute('data-bs-tags') : ''; + // Get the navbar tags associated with the card + var navbarItem = document.querySelector(`a.dropdown-item[href="${card.id}"]`); + var navbarTags = navbarItem ? navbarItem.getAttribute("data-bs-tags") : ""; - var content = title + ' ' + text + ' ' + navbarTags; + var content = title + " " + text + " " + navbarTags; - if (content.toUpperCase().indexOf(filter) > -1) { - card.style.display = ""; - } else { - card.style.display = "none"; - } + if (content.toUpperCase().indexOf(filter) > -1) { + card.style.display = ""; + } else { + card.style.display = "none"; } + } } - - function toggleFavorite(element) { - var img = element.querySelector('img'); - var card = element.closest('.feature-card'); - var cardId = card.id; - if (img.src.endsWith('star.svg')) { - img.src = 'images/star-fill.svg'; - card.classList.add('favorite'); - localStorage.setItem(cardId, 'favorite'); - } else { - img.src = 'images/star.svg'; - card.classList.remove('favorite'); - localStorage.removeItem(cardId); - } - reorderCards(); - updateFavoritesDropdown(); - filterCards(); + var img = element.querySelector("img"); + var card = element.closest(".feature-card"); + var cardId = card.id; + if (img.src.endsWith("star.svg")) { + img.src = "images/star-fill.svg"; + card.classList.add("favorite"); + localStorage.setItem(cardId, "favorite"); + } else { + img.src = "images/star.svg"; + card.classList.remove("favorite"); + localStorage.removeItem(cardId); + } + reorderCards(); + updateFavoritesDropdown(); + filterCards(); } function reorderCards() { - var container = document.querySelector('.features-container'); - var cards = Array.from(container.getElementsByClassName('feature-card')); - cards.sort(function(a, b) { - var aIsFavorite = localStorage.getItem(a.id) === 'favorite'; - var bIsFavorite = localStorage.getItem(b.id) === 'favorite'; - if (aIsFavorite && !bIsFavorite) { - return -1; - } - if (!aIsFavorite && bIsFavorite) { - return 1; - } - return 0; - }); - cards.forEach(function(card) { - container.appendChild(card); - }); + var container = document.querySelector(".features-container"); + var cards = Array.from(container.getElementsByClassName("feature-card")); + cards.sort(function (a, b) { + var aIsFavorite = localStorage.getItem(a.id) === "favorite"; + var bIsFavorite = localStorage.getItem(b.id) === "favorite"; + if (aIsFavorite && !bIsFavorite) { + return -1; + } + if (!aIsFavorite && bIsFavorite) { + return 1; + } + return 0; + }); + cards.forEach(function (card) { + container.appendChild(card); + }); } function initializeCards() { - var cards = document.querySelectorAll('.feature-card'); - cards.forEach(function(card) { - var cardId = card.id; - var img = card.querySelector('.favorite-icon img'); - if (localStorage.getItem(cardId) === 'favorite') { - img.src = 'images/star-fill.svg'; - card.classList.add('favorite'); - } - }); - reorderCards(); - updateFavoritesDropdown(); - filterCards(); + var cards = document.querySelectorAll(".feature-card"); + cards.forEach(function (card) { + var cardId = card.id; + var img = card.querySelector(".favorite-icon img"); + if (localStorage.getItem(cardId) === "favorite") { + img.src = "images/star-fill.svg"; + card.classList.add("favorite"); + } + }); + reorderCards(); + updateFavoritesDropdown(); + filterCards(); } -window.onload = initializeCards; \ No newline at end of file +window.onload = initializeCards; diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js index 4cc18f12..af67da48 100644 --- a/src/main/resources/static/js/languageSelection.js +++ b/src/main/resources/static/js/languageSelection.js @@ -1,80 +1,88 @@ -document.addEventListener('DOMContentLoaded', function() { - setLanguageForDropdown('.lang_dropdown-item'); +document.addEventListener("DOMContentLoaded", function () { + setLanguageForDropdown(".lang_dropdown-item"); - // Detect the browser's preferred language - let browserLang = navigator.language || navigator.userLanguage; - // Convert to a format consistent with your language codes (e.g., en-GB, fr-FR) - browserLang = browserLang.replace('-', '_'); + // Detect the browser's preferred language + let browserLang = navigator.language || navigator.userLanguage; + // Convert to a format consistent with your language codes (e.g., en-GB, fr-FR) + browserLang = browserLang.replace("-", "_"); - // Check if the dropdown contains the browser's language - const dropdownLangExists = document.querySelector(`.lang_dropdown-item[data-language-code="${browserLang}"]`); + // Check if the dropdown contains the browser's language + const dropdownLangExists = document.querySelector(`.lang_dropdown-item[data-language-code="${browserLang}"]`); - // Set the default language to browser's language or 'en_GB' if not found in the dropdown - const defaultLocale = dropdownLangExists ? browserLang : 'en_GB'; - const storedLocale = localStorage.getItem('languageCode') || defaultLocale; + // Set the default language to browser's language or 'en_GB' if not found in the dropdown + const defaultLocale = dropdownLangExists ? browserLang : "en_GB"; + const storedLocale = localStorage.getItem("languageCode") || defaultLocale; + const dropdownItems = document.querySelectorAll(".lang_dropdown-item"); - - const dropdownItems = document.querySelectorAll('.lang_dropdown-item'); - - for (let i = 0; i < dropdownItems.length; i++) { - const item = dropdownItems[i]; - item.classList.remove('active'); - if (item.dataset.languageCode === storedLocale) { - item.classList.add('active'); - } - item.addEventListener('click', handleDropdownItemClick); - } + for (let i = 0; i < dropdownItems.length; i++) { + const item = dropdownItems[i]; + item.classList.remove("active"); + if (item.dataset.languageCode === storedLocale) { + item.classList.add("active"); + } + item.addEventListener("click", handleDropdownItemClick); + } }); function setLanguageForDropdown(dropdownClass) { - const defaultLocale = document.documentElement.lang || 'en_GB'; - const storedLocale = localStorage.getItem('languageCode') || defaultLocale; - const dropdownItems = document.querySelectorAll(dropdownClass); + const defaultLocale = document.documentElement.lang || "en_GB"; + const storedLocale = localStorage.getItem("languageCode") || defaultLocale; + const dropdownItems = document.querySelectorAll(dropdownClass); - for (let i = 0; i < dropdownItems.length; i++) { - const item = dropdownItems[i]; - item.classList.remove('active'); - if (item.dataset.languageCode === storedLocale) { - item.classList.add('active'); - } - item.addEventListener('click', handleDropdownItemClick); + for (let i = 0; i < dropdownItems.length; i++) { + const item = dropdownItems[i]; + item.classList.remove("active"); + if (item.dataset.languageCode === storedLocale) { + item.classList.add("active"); } + item.addEventListener("click", handleDropdownItemClick); + } } function handleDropdownItemClick(event) { - event.preventDefault(); - const languageCode = event.currentTarget.dataset.bsLanguageCode; // change this to event.currentTarget - if (languageCode) { - localStorage.setItem('languageCode', languageCode); + event.preventDefault(); + const languageCode = event.currentTarget.dataset.bsLanguageCode; // change this to event.currentTarget + if (languageCode) { + localStorage.setItem("languageCode", languageCode); - const currentUrl = window.location.href; - if (currentUrl.indexOf('?lang=') === -1) { - window.location.href = currentUrl + '?lang=' + languageCode; - } else { - window.location.href = currentUrl.replace(/\?lang=\w{2,}/, '?lang=' + languageCode); - } + const currentUrl = window.location.href; + if (currentUrl.indexOf("?lang=") === -1) { + window.location.href = currentUrl + "?lang=" + languageCode; } else { - console.error("Language code is not set for this item."); // for debugging + window.location.href = currentUrl.replace(/\?lang=\w{2,}/, "?lang=" + languageCode); } + } else { + console.error("Language code is not set for this item."); // for debugging + } } +document.addEventListener("DOMContentLoaded", function () { + document.querySelectorAll(".nav-item.dropdown").forEach((element) => { + const dropdownMenu = element.querySelector(".dropdown-menu"); + if ( + dropdownMenu.id !== "favoritesDropdown" && + dropdownMenu.children.length <= 2 && + dropdownMenu.querySelectorAll("hr.dropdown-divider").length === dropdownMenu.children.length + ) { + if ( + element.previousElementSibling && + element.previousElementSibling.classList.contains("nav-item") && + element.previousElementSibling.classList.contains("nav-item-separator") + ) { + element.previousElementSibling.remove(); + } + element.remove(); + } + }); -document.addEventListener('DOMContentLoaded', function() { - document.querySelectorAll('.nav-item.dropdown').forEach((element) => { - const dropdownMenu = element.querySelector(".dropdown-menu"); - if (dropdownMenu.id !== 'favoritesDropdown' && dropdownMenu.children.length <= 2 && dropdownMenu.querySelectorAll("hr.dropdown-divider").length === dropdownMenu.children.length) { - if (element.previousElementSibling && element.previousElementSibling.classList.contains('nav-item') && element.previousElementSibling.classList.contains('nav-item-separator')) { - element.previousElementSibling.remove(); - } - element.remove(); - } - }); - - //Sort languages by alphabet - const list = Array.from(document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').children).filter(child => child.matches('a')); - list.sort(function(a, b) { - return a.textContent.toUpperCase().localeCompare(b.textContent.toUpperCase()); - }).forEach(node => document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').appendChild(node)); - -}); \ No newline at end of file + //Sort languages by alphabet + const list = Array.from(document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').children).filter( + (child) => child.matches("a"), + ); + list + .sort(function (a, b) { + return a.textContent.toUpperCase().localeCompare(b.textContent.toUpperCase()); + }) + .forEach((node) => document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').appendChild(node)); +}); diff --git a/src/main/resources/static/js/local-pdf-input-download.js b/src/main/resources/static/js/local-pdf-input-download.js index 37090390..44793884 100644 --- a/src/main/resources/static/js/local-pdf-input-download.js +++ b/src/main/resources/static/js/local-pdf-input-download.js @@ -1,47 +1,47 @@ async function downloadFilesWithCallback(processFileCallback) { - const fileInput = document.querySelector('input[type="file"]'); - const files = fileInput.files; + const fileInput = document.querySelector('input[type="file"]'); + const files = fileInput.files; - const zipThreshold = 4; - const zipFiles = files.length > zipThreshold; + const zipThreshold = 4; + const zipFiles = files.length > zipThreshold; - let jszip = null; - if (zipFiles) { - jszip = new JSZip(); - } + let jszip = null; + if (zipFiles) { + jszip = new JSZip(); + } - const promises = Array.from(files).map(async file => { - const { processedData, fileName } = await processFileCallback(file); - - if (zipFiles) { - jszip.file(fileName, processedData); - } else { - const url = URL.createObjectURL(processedData); - const downloadOption = localStorage.getItem('downloadOption'); - - if (downloadOption === 'sameWindow') { - window.location.href = url; - } else if (downloadOption === 'newWindow') { - window.open(url, '_blank'); - } else { - const downloadLink = document.createElement('a'); - downloadLink.href = url; - downloadLink.download = fileName; - downloadLink.click(); - } - } - }); - - await Promise.all(promises); + const promises = Array.from(files).map(async (file) => { + const { processedData, fileName } = await processFileCallback(file); if (zipFiles) { - const content = await jszip.generateAsync({ type: "blob" }); - const url = URL.createObjectURL(content); - const a = document.createElement('a'); - a.href = url; - a.download = "files.zip"; - document.body.appendChild(a); - a.click(); - a.remove(); + jszip.file(fileName, processedData); + } else { + const url = URL.createObjectURL(processedData); + const downloadOption = localStorage.getItem("downloadOption"); + + if (downloadOption === "sameWindow") { + window.location.href = url; + } else if (downloadOption === "newWindow") { + window.open(url, "_blank"); + } else { + const downloadLink = document.createElement("a"); + downloadLink.href = url; + downloadLink.download = fileName; + downloadLink.click(); + } } + }); + + await Promise.all(promises); + + if (zipFiles) { + const content = await jszip.generateAsync({ type: "blob" }); + const url = URL.createObjectURL(content); + const a = document.createElement("a"); + a.href = url; + a.download = "files.zip"; + document.body.appendChild(a); + a.click(); + a.remove(); + } } diff --git a/src/main/resources/static/js/merge.js b/src/main/resources/static/js/merge.js index e8e60d4f..4936fa6b 100644 --- a/src/main/resources/static/js/merge.js +++ b/src/main/resources/static/js/merge.js @@ -1,27 +1,27 @@ let currentSort = { - field: null, - descending: false + field: null, + descending: false, }; -document.getElementById("fileInput-input").addEventListener("change", function() { - var files = this.files; - displayFiles(files); +document.getElementById("fileInput-input").addEventListener("change", function () { + var files = this.files; + displayFiles(files); }); /** * @param {FileList} files */ function displayFiles(files) { - const list = document.getElementById("selectedFiles"); + const list = document.getElementById("selectedFiles"); - while (list.firstChild) { - list.removeChild(list.firstChild); - } + while (list.firstChild) { + list.removeChild(list.firstChild); + } - for (let i = 0; i < files.length; i++) { - const item = document.createElement("li"); - item.className = "list-group-item"; - item.innerHTML = ` + for (let i = 0; i < files.length; i++) { + const item = document.createElement("li"); + item.className = "list-group-item"; + item.innerHTML = `
${files[i].name}
@@ -31,100 +31,100 @@ function displayFiles(files) {
`; - list.appendChild(item); - } + list.appendChild(item); + } - attachMoveButtons(); + attachMoveButtons(); } function attachMoveButtons() { - var moveUpButtons = document.querySelectorAll(".move-up"); - for (var i = 0; i < moveUpButtons.length; i++) { - moveUpButtons[i].addEventListener("click", function(event) { - event.preventDefault(); - var parent = this.closest(".list-group-item"); - var grandParent = parent.parentNode; - if (parent.previousElementSibling) { - grandParent.insertBefore(parent, parent.previousElementSibling); - updateFiles(); - } - }); - } + var moveUpButtons = document.querySelectorAll(".move-up"); + for (var i = 0; i < moveUpButtons.length; i++) { + moveUpButtons[i].addEventListener("click", function (event) { + event.preventDefault(); + var parent = this.closest(".list-group-item"); + var grandParent = parent.parentNode; + if (parent.previousElementSibling) { + grandParent.insertBefore(parent, parent.previousElementSibling); + updateFiles(); + } + }); + } - var moveDownButtons = document.querySelectorAll(".move-down"); - for (var i = 0; i < moveDownButtons.length; i++) { - moveDownButtons[i].addEventListener("click", function(event) { - event.preventDefault(); - var parent = this.closest(".list-group-item"); - var grandParent = parent.parentNode; - if (parent.nextElementSibling) { - grandParent.insertBefore(parent.nextElementSibling, parent); - updateFiles(); - } - }); - } + var moveDownButtons = document.querySelectorAll(".move-down"); + for (var i = 0; i < moveDownButtons.length; i++) { + moveDownButtons[i].addEventListener("click", function (event) { + event.preventDefault(); + var parent = this.closest(".list-group-item"); + var grandParent = parent.parentNode; + if (parent.nextElementSibling) { + grandParent.insertBefore(parent.nextElementSibling, parent); + updateFiles(); + } + }); + } - var removeButtons = document.querySelectorAll(".remove-file"); - for (var i = 0; i < removeButtons.length; i++) { - removeButtons[i].addEventListener("click", function (event) { - event.preventDefault(); - var parent = this.closest(".list-group-item"); - parent.remove(); - updateFiles(); - }); - } + var removeButtons = document.querySelectorAll(".remove-file"); + for (var i = 0; i < removeButtons.length; i++) { + removeButtons[i].addEventListener("click", function (event) { + event.preventDefault(); + var parent = this.closest(".list-group-item"); + parent.remove(); + updateFiles(); + }); + } } -document.getElementById("sortByNameBtn").addEventListener("click", function() { - if (currentSort.field === "name" && !currentSort.descending) { - currentSort.descending = true; - sortFiles((a, b) => b.name.localeCompare(a.name)); - } else { - currentSort.field = "name"; - currentSort.descending = false; - sortFiles((a, b) => a.name.localeCompare(b.name)); - } +document.getElementById("sortByNameBtn").addEventListener("click", function () { + if (currentSort.field === "name" && !currentSort.descending) { + currentSort.descending = true; + sortFiles((a, b) => b.name.localeCompare(a.name)); + } else { + currentSort.field = "name"; + currentSort.descending = false; + sortFiles((a, b) => a.name.localeCompare(b.name)); + } }); -document.getElementById("sortByDateBtn").addEventListener("click", function() { - if (currentSort.field === "lastModified" && !currentSort.descending) { - currentSort.descending = true; - sortFiles((a, b) => b.lastModified - a.lastModified); - } else { - currentSort.field = "lastModified"; - currentSort.descending = false; - sortFiles((a, b) => a.lastModified - b.lastModified); - } +document.getElementById("sortByDateBtn").addEventListener("click", function () { + if (currentSort.field === "lastModified" && !currentSort.descending) { + currentSort.descending = true; + sortFiles((a, b) => b.lastModified - a.lastModified); + } else { + currentSort.field = "lastModified"; + currentSort.descending = false; + sortFiles((a, b) => a.lastModified - b.lastModified); + } }); function sortFiles(comparator) { - // Convert FileList to array and sort - const sortedFilesArray = Array.from(document.getElementById("fileInput-input").files).sort(comparator); + // Convert FileList to array and sort + const sortedFilesArray = Array.from(document.getElementById("fileInput-input").files).sort(comparator); - // Refresh displayed list - displayFiles(sortedFilesArray); + // Refresh displayed list + displayFiles(sortedFilesArray); - // Update the files property - const dataTransfer = new DataTransfer(); - sortedFilesArray.forEach(file => dataTransfer.items.add(file)); - document.getElementById("fileInput-input").files = dataTransfer.files; + // Update the files property + const dataTransfer = new DataTransfer(); + sortedFilesArray.forEach((file) => dataTransfer.items.add(file)); + document.getElementById("fileInput-input").files = dataTransfer.files; } function updateFiles() { - var dataTransfer = new DataTransfer(); - var liElements = document.querySelectorAll("#selectedFiles li"); - const files = document.getElementById("fileInput-input").files; + var dataTransfer = new DataTransfer(); + var liElements = document.querySelectorAll("#selectedFiles li"); + const files = document.getElementById("fileInput-input").files; - for (var i = 0; i < liElements.length; i++) { - var fileNameFromList = liElements[i].querySelector(".filename").innerText; - var fileFromFiles; - for (var j = 0; j < files.length; j++) { - var file = files[j]; - if (file.name === fileNameFromList) { - dataTransfer.items.add(file); - break; - } - } + for (var i = 0; i < liElements.length; i++) { + var fileNameFromList = liElements[i].querySelector(".filename").innerText; + var fileFromFiles; + for (var j = 0; j < files.length; j++) { + var file = files[j]; + if (file.name === fileNameFromList) { + dataTransfer.items.add(file); + break; + } } - document.getElementById("fileInput-input").files = dataTransfer.files; + } + document.getElementById("fileInput-input").files = dataTransfer.files; } diff --git a/src/main/resources/static/js/multitool/DragDropManager.js b/src/main/resources/static/js/multitool/DragDropManager.js index 2481adf1..004412d4 100644 --- a/src/main/resources/static/js/multitool/DragDropManager.js +++ b/src/main/resources/static/js/multitool/DragDropManager.js @@ -1,125 +1,123 @@ class DragDropManager { - dragContainer; - wrapper; - pageDirection; - movePageTo; - pageDragging; - draggelEl; - draggedImageEl; - hoveredEl; - endInsertionElement; + dragContainer; + wrapper; + pageDirection; + movePageTo; + pageDragging; + draggelEl; + draggedImageEl; + hoveredEl; + endInsertionElement; - constructor(id, wrapperId) { - this.dragContainer = document.getElementById(id); - this.pageDirection = document.documentElement.getAttribute("lang-direction"); - this.wrapper = document.getElementById(wrapperId); - this.pageDragging = false; - this.hoveredEl = undefined; - this.draggelEl = undefined - this.draggedImageEl = undefined; + constructor(id, wrapperId) { + this.dragContainer = document.getElementById(id); + this.pageDirection = document.documentElement.getAttribute("lang-direction"); + this.wrapper = document.getElementById(wrapperId); + this.pageDragging = false; + this.hoveredEl = undefined; + this.draggelEl = undefined; + this.draggedImageEl = undefined; - var styleElement = document.createElement('link'); - styleElement.rel = 'stylesheet'; - styleElement.href = 'css/dragdrop.css' + var styleElement = document.createElement("link"); + styleElement.rel = "stylesheet"; + styleElement.href = "css/dragdrop.css"; - document.head.appendChild(styleElement); + document.head.appendChild(styleElement); - const div = document.createElement('div'); - div.classList.add('drag-manager_endpoint'); - div.innerHTML = ` + const div = document.createElement("div"); + div.classList.add("drag-manager_endpoint"); + div.innerHTML = ` - ` - this.endInsertionElement = div; + `; + this.endInsertionElement = div; - this.startDraggingPage = this.startDraggingPage.bind(this); - this.onDragEl = this.onDragEl.bind(this); - this.stopDraggingPage = this.stopDraggingPage.bind(this); + this.startDraggingPage = this.startDraggingPage.bind(this); + this.onDragEl = this.onDragEl.bind(this); + this.stopDraggingPage = this.stopDraggingPage.bind(this); - this.adapt(div); + this.adapt(div); + } + + startDraggingPage(div) { + this.pageDragging = true; + this.draggedEl = div; + const img = div.querySelector("img"); + div.classList.add("drag-manager_dragging"); + const imageSrc = img.src; + + const imgEl = document.createElement("img"); + imgEl.classList.add("dragged-img"); + imgEl.src = imageSrc; + this.draggedImageEl = imgEl; + imgEl.style.visibility = "hidden"; + imgEl.style.transform = `rotate(${img.style.rotate === "" ? "0deg" : img.style.rotate}) translate(-50%, -50%)`; + this.dragContainer.appendChild(imgEl); + + window.addEventListener("mouseup", this.stopDraggingPage); + window.addEventListener("mousemove", this.onDragEl); + this.wrapper.classList.add("drag-manager_dragging-container"); + this.wrapper.appendChild(this.endInsertionElement); + } + + onDragEl(mouseEvent) { + const { clientX, clientY } = mouseEvent; + if (this.draggedImageEl) { + this.draggedImageEl.style.visibility = "visible"; + this.draggedImageEl.style.left = `${clientX}px`; + this.draggedImageEl.style.top = `${clientY}px`; } + } - startDraggingPage(div,) { - this.pageDragging = true; - this.draggedEl = div; - const img = div.querySelector('img'); - div.classList.add('drag-manager_dragging'); - const imageSrc = img.src; - - const imgEl = document.createElement('img'); - imgEl.classList.add('dragged-img'); - imgEl.src = imageSrc; - this.draggedImageEl = imgEl; - imgEl.style.visibility = 'hidden'; - imgEl.style.transform = `rotate(${img.style.rotate === '' ? '0deg' : img.style.rotate}) translate(-50%, -50%)`; - this.dragContainer.appendChild(imgEl); - - window.addEventListener('mouseup', this.stopDraggingPage) - window.addEventListener('mousemove', this.onDragEl) - this.wrapper.classList.add('drag-manager_dragging-container'); - this.wrapper.appendChild(this.endInsertionElement); + stopDraggingPage() { + window.removeEventListener("mousemove", this.onDragEl); + this.wrapper.classList.remove("drag-manager_dragging-container"); + this.wrapper.removeChild(this.endInsertionElement); + window.removeEventListener("mouseup", this.stopDraggingPage); + this.draggedImageEl = undefined; + this.pageDragging = false; + this.draggedEl.classList.remove("drag-manager_dragging"); + this.hoveredEl?.classList.remove("drag-manager_draghover"); + this.dragContainer.childNodes.forEach((dragChild) => { + this.dragContainer.removeChild(dragChild); + }); + if (!this.hoveredEl) { + return; } - - onDragEl(mouseEvent) { - const { clientX, clientY } = mouseEvent; - if(this.draggedImageEl) { - this.draggedImageEl.style.visibility = 'visible'; - this.draggedImageEl.style.left = `${clientX}px`; - this.draggedImageEl.style.top = `${clientY}px`; - } + if (this.hoveredEl === this.endInsertionElement) { + this.movePageTo(this.draggedEl); + return; } + this.movePageTo(this.draggedEl, this.hoveredEl); + } + setActions({ movePageTo }) { + this.movePageTo = movePageTo; + } - stopDraggingPage() { - window.removeEventListener('mousemove', this.onDragEl); - this.wrapper.classList.remove('drag-manager_dragging-container'); - this.wrapper.removeChild(this.endInsertionElement); - window.removeEventListener('mouseup', this.stopDraggingPage) - this.draggedImageEl = undefined; - this.pageDragging = false; - this.draggedEl.classList.remove('drag-manager_dragging'); - this.hoveredEl?.classList.remove('drag-manager_draghover'); - this.dragContainer.childNodes.forEach((dragChild) => { - this.dragContainer.removeChild(dragChild); - }) - if(!this.hoveredEl) { - return; - } - if(this.hoveredEl === this.endInsertionElement) { - this.movePageTo(this.draggedEl); - return; - } - this.movePageTo(this.draggedEl, this.hoveredEl); - } + adapt(div) { + const onDragStart = () => { + this.startDraggingPage(div); + }; - setActions({ movePageTo }) { - this.movePageTo = movePageTo; - } + const onMouseEnter = () => { + if (this.pageDragging) { + this.hoveredEl = div; + div.classList.add("drag-manager_draghover"); + } + }; + const onMouseLeave = () => { + this.hoveredEl = undefined; + div.classList.remove("drag-manager_draghover"); + }; - adapt(div) { - const onDragStart = () => { - this.startDraggingPage(div); - } + div.addEventListener("dragstart", onDragStart); + div.addEventListener("mouseenter", onMouseEnter); + div.addEventListener("mouseleave", onMouseLeave); - const onMouseEnter = () => { - if (this.pageDragging) { - this.hoveredEl = div; - div.classList.add('drag-manager_draghover'); - } - } - - const onMouseLeave = () => { - this.hoveredEl = undefined - div.classList.remove('drag-manager_draghover'); - } - - div.addEventListener('dragstart', onDragStart); - div.addEventListener('mouseenter', onMouseEnter); - div.addEventListener('mouseleave', onMouseLeave); - - return div; - } + return div; + } } export default DragDropManager; diff --git a/src/main/resources/static/js/multitool/ImageHighlighter.js b/src/main/resources/static/js/multitool/ImageHighlighter.js index 6f7cd22e..b72df3bb 100644 --- a/src/main/resources/static/js/multitool/ImageHighlighter.js +++ b/src/main/resources/static/js/multitool/ImageHighlighter.js @@ -1,46 +1,46 @@ class ImageHiglighter { - imageHighlighter; - constructor(id) { - this.imageHighlighter = document.getElementById(id); - this.imageHighlightCallback = this.imageHighlightCallback.bind(this); + imageHighlighter; + constructor(id) { + this.imageHighlighter = document.getElementById(id); + this.imageHighlightCallback = this.imageHighlightCallback.bind(this); - var styleElement = document.createElement('link'); - styleElement.rel = 'stylesheet'; - styleElement.href = 'css/imageHighlighter.css' + var styleElement = document.createElement("link"); + styleElement.rel = "stylesheet"; + styleElement.href = "css/imageHighlighter.css"; - document.head.appendChild(styleElement); + document.head.appendChild(styleElement); - this.imageHighlighter.onclick = () => { - this.imageHighlighter.childNodes.forEach((child) => { - child.classList.add('remove'); - setTimeout(() => { - this.imageHighlighter.removeChild(child); - }, 100) - }) - } - } - - imageHighlightCallback(highlightEvent) { - var bigImg = document.createElement('img'); - bigImg.onclick = (imageClickEvent) => { - // This prevents the highlighter's onClick from closing the image when clicking - // on the image instead of next to it. - imageClickEvent.preventDefault(); - imageClickEvent.stopPropagation(); - }; - bigImg.src = highlightEvent.target.src; - this.imageHighlighter.appendChild(bigImg); + this.imageHighlighter.onclick = () => { + this.imageHighlighter.childNodes.forEach((child) => { + child.classList.add("remove"); + setTimeout(() => { + this.imageHighlighter.removeChild(child); + }, 100); + }); }; + } - setActions() { - // not needed in this case - } + imageHighlightCallback(highlightEvent) { + var bigImg = document.createElement("img"); + bigImg.onclick = (imageClickEvent) => { + // This prevents the highlighter's onClick from closing the image when clicking + // on the image instead of next to it. + imageClickEvent.preventDefault(); + imageClickEvent.stopPropagation(); + }; + bigImg.src = highlightEvent.target.src; + this.imageHighlighter.appendChild(bigImg); + } - adapt(div) { - const img = div.querySelector('.page-image'); - img.addEventListener('click', this.imageHighlightCallback) - return div; - } + setActions() { + // not needed in this case + } + + adapt(div) { + const img = div.querySelector(".page-image"); + img.addEventListener("click", this.imageHighlightCallback); + return div; + } } -export default ImageHiglighter; \ No newline at end of file +export default ImageHiglighter; diff --git a/src/main/resources/static/js/multitool/PdfActionsManager.js b/src/main/resources/static/js/multitool/PdfActionsManager.js index b77d2121..2fae22d3 100644 --- a/src/main/resources/static/js/multitool/PdfActionsManager.js +++ b/src/main/resources/static/js/multitool/PdfActionsManager.js @@ -1,198 +1,200 @@ class PdfActionsManager { - pageDirection; - pagesContainer; + pageDirection; + pagesContainer; - constructor(id) { - this.pagesContainer = document.getElementById(id); - this.pageDirection = document.documentElement.getAttribute("lang-direction"); + constructor(id) { + this.pagesContainer = document.getElementById(id); + this.pageDirection = document.documentElement.getAttribute("lang-direction"); - var styleElement = document.createElement('link'); - styleElement.rel = 'stylesheet'; - styleElement.href = 'css/pdfActions.css' + var styleElement = document.createElement("link"); + styleElement.rel = "stylesheet"; + styleElement.href = "css/pdfActions.css"; - document.head.appendChild(styleElement); + document.head.appendChild(styleElement); + } + + getPageContainer(element) { + var container = element; + while (!container.classList.contains("page-container")) { + container = container.parentNode; } + return container; + } - getPageContainer(element) { - var container = element - while (!container.classList.contains('page-container')) { - container = container.parentNode; - } - return container; + moveUpButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + + const sibling = imgContainer.previousSibling; + if (sibling) { + this.movePageTo(imgContainer, sibling, true); } + } - moveUpButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - - const sibling = imgContainer.previousSibling; - if (sibling) { - this.movePageTo(imgContainer, sibling, true); - } + moveDownButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + const sibling = imgContainer.nextSibling; + if (sibling) { + this.movePageTo(imgContainer, sibling.nextSibling, true); } + } - moveDownButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - const sibling = imgContainer.nextSibling; - if (sibling) { - this.movePageTo(imgContainer, sibling.nextSibling, true); - } - }; + rotateCCWButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + const img = imgContainer.querySelector("img"); - rotateCCWButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - const img = imgContainer.querySelector("img"); + this.rotateElement(img, -90); + } - this.rotateElement(img, -90) - }; + rotateCWButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + const img = imgContainer.querySelector("img"); - rotateCWButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - const img = imgContainer.querySelector("img"); + this.rotateElement(img, 90); + } - this.rotateElement(img, 90) - }; + deletePageButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + this.pagesContainer.removeChild(imgContainer); + if (this.pagesContainer.childElementCount === 0) { + const filenameInput = document.getElementById("filename-input"); + const filenameParagraph = document.getElementById("filename"); + const downloadBtn = document.getElementById("export-button"); - deletePageButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - this.pagesContainer.removeChild(imgContainer); - if (this.pagesContainer.childElementCount === 0) { - const filenameInput = document.getElementById('filename-input'); - const filenameParagraph = document.getElementById('filename'); - const downloadBtn = document.getElementById('export-button'); + filenameInput.disabled = true; + filenameInput.value = ""; + filenameParagraph.innerText = ""; - filenameInput.disabled = true; - filenameInput.value = ""; - filenameParagraph.innerText = ""; - - downloadBtn.disabled = true; - } - }; - - insertFileButtonCallback(e) { - var imgContainer = this.getPageContainer(e.target); - this.addPdfs(imgContainer) - }; - - setActions({ movePageTo, addPdfs, rotateElement }) { - this.movePageTo = movePageTo; - this.addPdfs = addPdfs; - this.rotateElement = rotateElement; - - this.moveUpButtonCallback = this.moveUpButtonCallback.bind(this); - this.moveDownButtonCallback = this.moveDownButtonCallback.bind(this); - this.rotateCCWButtonCallback = this.rotateCCWButtonCallback.bind(this); - this.rotateCWButtonCallback = this.rotateCWButtonCallback.bind(this); - this.deletePageButtonCallback = this.deletePageButtonCallback.bind(this); - this.insertFileButtonCallback = this.insertFileButtonCallback.bind(this); + downloadBtn.disabled = true; } + } - adapt(div) { - div.classList.add('pdf-actions_container'); - const leftDirection = this.pageDirection === 'rtl' ? 'right' : 'left' - const rightDirection = this.pageDirection === 'rtl' ? 'left' : 'right' - const buttonContainer = document.createElement('div'); + insertFileButtonCallback(e) { + var imgContainer = this.getPageContainer(e.target); + this.addPdfs(imgContainer); + } - buttonContainer.classList.add("pdf-actions_button-container", "hide-on-drag"); + setActions({ movePageTo, addPdfs, rotateElement }) { + this.movePageTo = movePageTo; + this.addPdfs = addPdfs; + this.rotateElement = rotateElement; - const moveUp = document.createElement('button'); - moveUp.classList.add("pdf-actions_move-left-button","btn", "btn-secondary"); - moveUp.innerHTML = ``; - moveUp.onclick = this.moveUpButtonCallback; - buttonContainer.appendChild(moveUp); + this.moveUpButtonCallback = this.moveUpButtonCallback.bind(this); + this.moveDownButtonCallback = this.moveDownButtonCallback.bind(this); + this.rotateCCWButtonCallback = this.rotateCCWButtonCallback.bind(this); + this.rotateCWButtonCallback = this.rotateCWButtonCallback.bind(this); + this.deletePageButtonCallback = this.deletePageButtonCallback.bind(this); + this.insertFileButtonCallback = this.insertFileButtonCallback.bind(this); + } - const moveDown = document.createElement('button'); - moveDown.classList.add("pdf-actions_move-right-button","btn", "btn-secondary"); - moveDown.innerHTML = ``; - moveDown.onclick = this.moveDownButtonCallback; - buttonContainer.appendChild(moveDown); + adapt(div) { + div.classList.add("pdf-actions_container"); + const leftDirection = this.pageDirection === "rtl" ? "right" : "left"; + const rightDirection = this.pageDirection === "rtl" ? "left" : "right"; + const buttonContainer = document.createElement("div"); - const rotateCCW = document.createElement('button'); - rotateCCW.classList.add("btn", "btn-secondary"); - rotateCCW.innerHTML = ` + buttonContainer.classList.add("pdf-actions_button-container", "hide-on-drag"); + + const moveUp = document.createElement("button"); + moveUp.classList.add("pdf-actions_move-left-button", "btn", "btn-secondary"); + moveUp.innerHTML = ``; + moveUp.onclick = this.moveUpButtonCallback; + buttonContainer.appendChild(moveUp); + + const moveDown = document.createElement("button"); + moveDown.classList.add("pdf-actions_move-right-button", "btn", "btn-secondary"); + moveDown.innerHTML = ``; + moveDown.onclick = this.moveDownButtonCallback; + buttonContainer.appendChild(moveDown); + + const rotateCCW = document.createElement("button"); + rotateCCW.classList.add("btn", "btn-secondary"); + rotateCCW.innerHTML = ` `; - rotateCCW.onclick = this.rotateCCWButtonCallback; - buttonContainer.appendChild(rotateCCW); + rotateCCW.onclick = this.rotateCCWButtonCallback; + buttonContainer.appendChild(rotateCCW); - const rotateCW = document.createElement('button'); - rotateCW.classList.add("btn", "btn-secondary"); - rotateCW.innerHTML = ` + const rotateCW = document.createElement("button"); + rotateCW.classList.add("btn", "btn-secondary"); + rotateCW.innerHTML = ` `; - rotateCW.onclick = this.rotateCWButtonCallback; - buttonContainer.appendChild(rotateCW); + rotateCW.onclick = this.rotateCWButtonCallback; + buttonContainer.appendChild(rotateCW); - const deletePage = document.createElement('button'); - deletePage.classList.add("btn", "btn-danger"); - deletePage.innerHTML = ` + const deletePage = document.createElement("button"); + deletePage.classList.add("btn", "btn-danger"); + deletePage.innerHTML = ` `; - deletePage.onclick = this.deletePageButtonCallback; - buttonContainer.appendChild(deletePage); + deletePage.onclick = this.deletePageButtonCallback; + buttonContainer.appendChild(deletePage); - div.appendChild(buttonContainer); + div.appendChild(buttonContainer); - const insertFileButtonContainer = document.createElement('div'); + const insertFileButtonContainer = document.createElement("div"); - insertFileButtonContainer.classList.add( - "pdf-actions_insert-file-button-container", - leftDirection, - `align-center-${leftDirection}`); + insertFileButtonContainer.classList.add( + "pdf-actions_insert-file-button-container", + leftDirection, + `align-center-${leftDirection}`, + ); - const insertFileButton = document.createElement('button'); - insertFileButton.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button"); - insertFileButton.innerHTML = ` + const insertFileButton = document.createElement("button"); + insertFileButton.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button"); + insertFileButton.innerHTML = ` `; - insertFileButton.onclick = this.insertFileButtonCallback; - insertFileButtonContainer.appendChild(insertFileButton); + insertFileButton.onclick = this.insertFileButtonCallback; + insertFileButtonContainer.appendChild(insertFileButton); - div.appendChild(insertFileButtonContainer); + div.appendChild(insertFileButtonContainer); - // add this button to every element, but only show it on the last one :D - const insertFileButtonRightContainer = document.createElement('div'); - insertFileButtonRightContainer.classList.add( - "pdf-actions_insert-file-button-container", - rightDirection, - `align-center-${rightDirection}`); + // add this button to every element, but only show it on the last one :D + const insertFileButtonRightContainer = document.createElement("div"); + insertFileButtonRightContainer.classList.add( + "pdf-actions_insert-file-button-container", + rightDirection, + `align-center-${rightDirection}`, + ); - const insertFileButtonRight = document.createElement('button'); - insertFileButtonRight.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button"); - insertFileButtonRight.innerHTML = ` + const insertFileButtonRight = document.createElement("button"); + insertFileButtonRight.classList.add("btn", "btn-primary", "pdf-actions_insert-file-button"); + insertFileButtonRight.innerHTML = ` insertFileButtonRight`; - insertFileButtonRight.onclick = () => addPdfs(); - insertFileButtonRightContainer.appendChild(insertFileButtonRight); + insertFileButtonRight.onclick = () => addPdfs(); + insertFileButtonRightContainer.appendChild(insertFileButtonRight); - div.appendChild(insertFileButtonRightContainer); + div.appendChild(insertFileButtonRightContainer); - const adaptPageNumber = (pageNumber, div) => { - const pageNumberElement = document.createElement('span'); - pageNumberElement.classList.add('page-number'); - pageNumberElement.textContent = pageNumber; + const adaptPageNumber = (pageNumber, div) => { + const pageNumberElement = document.createElement("span"); + pageNumberElement.classList.add("page-number"); + pageNumberElement.textContent = pageNumber; - div.insertBefore(pageNumberElement, div.firstChild); - }; + div.insertBefore(pageNumberElement, div.firstChild); + }; - div.addEventListener('mouseenter', () => { - const pageNumber = Array.from(div.parentNode.children).indexOf(div) + 1; - adaptPageNumber(pageNumber, div); - }); + div.addEventListener("mouseenter", () => { + const pageNumber = Array.from(div.parentNode.children).indexOf(div) + 1; + adaptPageNumber(pageNumber, div); + }); - div.addEventListener('mouseleave', () => { - const pageNumberElement = div.querySelector('.page-number'); - if (pageNumberElement) { - div.removeChild(pageNumberElement); - } - }); + div.addEventListener("mouseleave", () => { + const pageNumberElement = div.querySelector(".page-number"); + if (pageNumberElement) { + div.removeChild(pageNumberElement); + } + }); - return div; - } + return div; + } } -export default PdfActionsManager; \ No newline at end of file +export default PdfActionsManager; diff --git a/src/main/resources/static/js/multitool/PdfContainer.js b/src/main/resources/static/js/multitool/PdfContainer.js index 1823cff4..76911a25 100644 --- a/src/main/resources/static/js/multitool/PdfContainer.js +++ b/src/main/resources/static/js/multitool/PdfContainer.js @@ -1,285 +1,282 @@ class PdfContainer { - fileName; - pagesContainer; - pagesContainerWrapper; - pdfAdapters; - downloadLink; + fileName; + pagesContainer; + pagesContainerWrapper; + pdfAdapters; + downloadLink; - constructor(id, wrapperId, pdfAdapters) { - this.pagesContainer = document.getElementById(id) - this.pagesContainerWrapper = document.getElementById(wrapperId); - this.downloadLink = null; - this.movePageTo = this.movePageTo.bind(this); - this.addPdfs = this.addPdfs.bind(this); - this.addPdfsFromFiles = this.addPdfsFromFiles.bind(this); - this.rotateElement = this.rotateElement.bind(this); - this.rotateAll = this.rotateAll.bind(this); - this.exportPdf = this.exportPdf.bind(this); - this.updateFilename = this.updateFilename.bind(this); - this.setDownloadAttribute = this.setDownloadAttribute.bind(this); - this.preventIllegalChars = this.preventIllegalChars.bind(this); + constructor(id, wrapperId, pdfAdapters) { + this.pagesContainer = document.getElementById(id); + this.pagesContainerWrapper = document.getElementById(wrapperId); + this.downloadLink = null; + this.movePageTo = this.movePageTo.bind(this); + this.addPdfs = this.addPdfs.bind(this); + this.addPdfsFromFiles = this.addPdfsFromFiles.bind(this); + this.rotateElement = this.rotateElement.bind(this); + this.rotateAll = this.rotateAll.bind(this); + this.exportPdf = this.exportPdf.bind(this); + this.updateFilename = this.updateFilename.bind(this); + this.setDownloadAttribute = this.setDownloadAttribute.bind(this); + this.preventIllegalChars = this.preventIllegalChars.bind(this); - this.pdfAdapters = pdfAdapters; + this.pdfAdapters = pdfAdapters; - this.pdfAdapters.forEach(adapter => { - adapter.setActions({ - movePageTo: this.movePageTo, - addPdfs: this.addPdfs, - rotateElement: this.rotateElement, - updateFilename: this.updateFilename - }) - }) + this.pdfAdapters.forEach((adapter) => { + adapter.setActions({ + movePageTo: this.movePageTo, + addPdfs: this.addPdfs, + rotateElement: this.rotateElement, + updateFilename: this.updateFilename, + }); + }); - window.addPdfs = this.addPdfs; - window.exportPdf = this.exportPdf; - window.rotateAll = this.rotateAll; + window.addPdfs = this.addPdfs; + window.exportPdf = this.exportPdf; + window.rotateAll = this.rotateAll; - const filenameInput = document.getElementById('filename-input'); - const downloadBtn = document.getElementById('export-button'); + const filenameInput = document.getElementById("filename-input"); + const downloadBtn = document.getElementById("export-button"); - filenameInput.onkeyup = this.updateFilename; - filenameInput.onkeydown = this.preventIllegalChars; - filenameInput.disabled = false; - filenameInput.innerText = ""; - downloadBtn.disabled = true; + filenameInput.onkeyup = this.updateFilename; + filenameInput.onkeydown = this.preventIllegalChars; + filenameInput.disabled = false; + filenameInput.innerText = ""; + downloadBtn.disabled = true; + } + + movePageTo(startElement, endElement, scrollTo = false) { + const childArray = Array.from(this.pagesContainer.childNodes); + const startIndex = childArray.indexOf(startElement); + const endIndex = childArray.indexOf(endElement); + this.pagesContainer.removeChild(startElement); + if (!endElement) { + this.pagesContainer.append(startElement); + } else { + this.pagesContainer.insertBefore(startElement, endElement); } - movePageTo(startElement, endElement, scrollTo = false) { - const childArray = Array.from(this.pagesContainer.childNodes); - const startIndex = childArray.indexOf(startElement); - const endIndex = childArray.indexOf(endElement); - this.pagesContainer.removeChild(startElement); - if(!endElement) { - this.pagesContainer.append(startElement); + if (scrollTo) { + const { width } = startElement.getBoundingClientRect(); + const vector = endIndex !== -1 && startIndex > endIndex ? 0 - width : width; + + this.pagesContainerWrapper.scroll({ + left: this.pagesContainerWrapper.scrollLeft + vector, + }); + } + } + + addPdfs(nextSiblingElement) { + var input = document.createElement("input"); + input.type = "file"; + input.multiple = true; + input.setAttribute("accept", "application/pdf"); + input.onchange = async (e) => { + const files = e.target.files; + + this.addPdfsFromFiles(files, nextSiblingElement); + this.updateFilename(files ? files[0].name : ""); + }; + + input.click(); + } + + async addPdfsFromFiles(files, nextSiblingElement) { + this.fileName = files[0].name; + for (var i = 0; i < files.length; i++) { + await this.addPdfFile(files[i], nextSiblingElement); + } + + document.querySelectorAll(".enable-on-file").forEach((element) => { + element.disabled = false; + }); + } + + rotateElement(element, deg) { + var lastTransform = element.style.rotate; + if (!lastTransform) { + lastTransform = "0"; + } + const lastAngle = parseInt(lastTransform.replace(/[^\d-]/g, "")); + const newAngle = lastAngle + deg; + + element.style.rotate = newAngle + "deg"; + } + + async addPdfFile(file, nextSiblingElement) { + const { renderer, pdfDocument } = await this.loadFile(file); + + for (var i = 0; i < renderer.pageCount; i++) { + const div = document.createElement("div"); + + div.classList.add("page-container"); + + var img = document.createElement("img"); + img.classList.add("page-image"); + const imageSrc = await renderer.renderPage(i); + img.src = imageSrc; + img.pageIdx = i; + img.rend = renderer; + img.doc = pdfDocument; + div.appendChild(img); + + this.pdfAdapters.forEach((adapter) => { + adapter.adapt?.(div); + }); + if (nextSiblingElement) { + this.pagesContainer.insertBefore(div, nextSiblingElement); + } else { + this.pagesContainer.appendChild(div); + } + } + } + + async loadFile(file) { + var objectUrl = URL.createObjectURL(file); + var pdfDocument = await this.toPdfLib(objectUrl); + var renderer = await this.toRenderer(objectUrl); + return { renderer, pdfDocument }; + } + + async toRenderer(objectUrl) { + pdfjsLib.GlobalWorkerOptions.workerSrc = "pdfjs/pdf.worker.js"; + const pdf = await pdfjsLib.getDocument(objectUrl).promise; + return { + document: pdf, + pageCount: pdf.numPages, + renderPage: async function (pageIdx) { + const page = await this.document.getPage(pageIdx + 1); + + const canvas = document.createElement("canvas"); + + // set the canvas size to the size of the page + if (page.rotate == 90 || page.rotate == 270) { + canvas.width = page.view[3]; + canvas.height = page.view[2]; } else { - this.pagesContainer.insertBefore(startElement, endElement); + canvas.width = page.view[2]; + canvas.height = page.view[3]; } - if(scrollTo) { - const { width } = startElement.getBoundingClientRect(); - const vector = (endIndex !== -1 && startIndex > endIndex) - ? 0-width - : width; - - this.pagesContainerWrapper.scroll({ - left: this.pagesContainerWrapper.scrollLeft + vector, - }) - } - } - - addPdfs(nextSiblingElement) { - var input = document.createElement('input'); - input.type = 'file'; - input.multiple = true; - input.setAttribute("accept", "application/pdf"); - input.onchange = async(e) => { - const files = e.target.files; - - this.addPdfsFromFiles(files, nextSiblingElement); - this.updateFilename(files ? files[0].name : ""); - } - - input.click(); - } - - async addPdfsFromFiles(files, nextSiblingElement) { - this.fileName = files[0].name; - for (var i=0; i < files.length; i++) { - await this.addPdfFile(files[i], nextSiblingElement); - } - - document.querySelectorAll(".enable-on-file").forEach(element => { - element.disabled = false; - }); - } - - rotateElement(element, deg) { - var lastTransform = element.style.rotate; - if (!lastTransform) { - lastTransform = "0"; - } - const lastAngle = parseInt(lastTransform.replace(/[^\d-]/g, '')); - const newAngle = lastAngle + deg; - - element.style.rotate = newAngle + "deg"; - } - - async addPdfFile(file, nextSiblingElement) { - const { renderer, pdfDocument } = await this.loadFile(file); - - for (var i=0; i < renderer.pageCount; i++) { - const div = document.createElement('div'); - - div.classList.add("page-container"); - - var img = document.createElement('img'); - img.classList.add('page-image') - const imageSrc = await renderer.renderPage(i) - img.src = imageSrc; - img.pageIdx = i; - img.rend = renderer; - img.doc = pdfDocument; - div.appendChild(img); - - this.pdfAdapters.forEach((adapter) => { - adapter.adapt?.(div) - }) - if (nextSiblingElement) { - this.pagesContainer.insertBefore(div, nextSiblingElement); - } else { - this.pagesContainer.appendChild(div); - } - } - } - - async loadFile(file) { - var objectUrl = URL.createObjectURL(file); - var pdfDocument = await this.toPdfLib(objectUrl); - var renderer = await this.toRenderer(objectUrl); - return { renderer, pdfDocument }; - } - - async toRenderer(objectUrl) { - pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdfjs/pdf.worker.js' - const pdf = await pdfjsLib.getDocument(objectUrl).promise; - return { - document: pdf, - pageCount: pdf.numPages, - renderPage: async function(pageIdx) { - const page = await this.document.getPage(pageIdx+1); - - const canvas = document.createElement("canvas"); - - // set the canvas size to the size of the page - if (page.rotate == 90 || page.rotate == 270) { - canvas.width = page.view[3]; - canvas.height = page.view[2]; - } else { - canvas.width = page.view[2]; - canvas.height = page.view[3]; - } - - // render the page onto the canvas - var renderContext = { - canvasContext: canvas.getContext("2d"), - viewport: page.getViewport({ scale: 1 }) - }; - - await page.render(renderContext).promise; - return canvas.toDataURL(); - } + // render the page onto the canvas + var renderContext = { + canvasContext: canvas.getContext("2d"), + viewport: page.getViewport({ scale: 1 }), }; + + await page.render(renderContext).promise; + return canvas.toDataURL(); + }, + }; + } + + async toPdfLib(objectUrl) { + const existingPdfBytes = await fetch(objectUrl).then((res) => res.arrayBuffer()); + const pdfDoc = await PDFLib.PDFDocument.load(existingPdfBytes, { + ignoreEncryption: true, + }); + return pdfDoc; + } + + rotateAll(deg) { + for (var i = 0; i < this.pagesContainer.childNodes.length; i++) { + const img = this.pagesContainer.childNodes[i].querySelector("img"); + if (!img) continue; + this.rotateElement(img, deg); + } + } + + async exportPdf() { + const pdfDoc = await PDFLib.PDFDocument.create(); + const pageContainers = this.pagesContainer.querySelectorAll(".page-container"); // Select all .page-container elements + for (var i = 0; i < pageContainers.length; i++) { + const img = pageContainers[i].querySelector("img"); // Find the img element within each .page-container + if (!img) continue; + const pages = await pdfDoc.copyPages(img.doc, [img.pageIdx]); + const page = pages[0]; + + const rotation = img.style.rotate; + if (rotation) { + const rotationAngle = parseInt(rotation.replace(/[^\d-]/g, "")); + page.setRotation(PDFLib.degrees(page.getRotation().angle + rotationAngle)); + } + + pdfDoc.addPage(page); + } + const pdfBytes = await pdfDoc.save(); + const pdfBlob = new Blob([pdfBytes], { type: "application/pdf" }); + const url = URL.createObjectURL(pdfBlob); + const downloadOption = localStorage.getItem("downloadOption"); + + const filenameInput = document.getElementById("filename-input"); + + let inputArr = filenameInput.value.split("."); + + if (inputArr !== null && inputArr !== undefined && inputArr.length > 0) { + inputArr = inputArr.filter((n) => n); // remove all empty strings, nulls or undefined + + if (inputArr.length > 1) { + inputArr.pop(); // remove right part after last dot + } + + filenameInput.value = inputArr.join(""); + this.fileName = filenameInput.value; } - async toPdfLib(objectUrl) { - const existingPdfBytes = await fetch(objectUrl).then(res => res.arrayBuffer()); - const pdfDoc = await PDFLib.PDFDocument.load(existingPdfBytes, { ignoreEncryption: true }); - return pdfDoc; + if (!filenameInput.value.includes(".pdf")) { + filenameInput.value = filenameInput.value + ".pdf"; + this.fileName = filenameInput.value; } + if (downloadOption === "sameWindow") { + // Open the file in the same window + window.location.href = url; + } else if (downloadOption === "newWindow") { + // Open the file in a new window + window.open(url, "_blank"); + } else { + // Download the file + this.downloadLink = document.createElement("a"); + this.downloadLink.id = "download-link"; + this.downloadLink.href = url; + // downloadLink.download = this.fileName ? this.fileName : 'managed.pdf'; + // downloadLink.download = this.fileName; + this.downloadLink.setAttribute("download", this.fileName ? this.fileName : "managed.pdf"); + this.downloadLink.setAttribute("target", "_blank"); + this.downloadLink.onclick = this.setDownloadAttribute; + this.downloadLink.click(); + } + } + setDownloadAttribute() { + this.downloadLink.setAttribute("download", this.fileName ? this.fileName : "managed.pdf"); + } - rotateAll(deg) { - for (var i=0; i 0) { - - inputArr = inputArr.filter(n => n); // remove all empty strings, nulls or undefined - - if (inputArr.length > 1) { - inputArr.pop(); // remove right part after last dot - } - - filenameInput.value = inputArr.join(''); - this.fileName = filenameInput.value; - } - - if (!filenameInput.value.includes('.pdf')) { - filenameInput.value = filenameInput.value + '.pdf'; - this.fileName = filenameInput.value; - } - - if (downloadOption === 'sameWindow') { - // Open the file in the same window - window.location.href = url; - } else if (downloadOption === 'newWindow') { - // Open the file in a new window - window.open(url, '_blank'); - } else { - // Download the file - this.downloadLink = document.createElement('a'); - this.downloadLink.id = 'download-link'; - this.downloadLink.href = url; - // downloadLink.download = this.fileName ? this.fileName : 'managed.pdf'; - // downloadLink.download = this.fileName; - this.downloadLink.setAttribute('download', this.fileName ? this.fileName : 'managed.pdf'); - this.downloadLink.setAttribute('target', '_blank'); - this.downloadLink.onclick = this.setDownloadAttribute; - this.downloadLink.click(); - } + if (!filenameInput.value) { + filenameInput.value = this.fileName; } + } - setDownloadAttribute() { - this.downloadLink.setAttribute("download", this.fileName ? this.fileName : 'managed.pdf'); - } - - updateFilename(fileName = "") { - const filenameInput = document.getElementById('filename-input'); - const pagesContainer = document.getElementById('pages-container'); - const downloadBtn = document.getElementById('export-button'); - - downloadBtn.disabled = pagesContainer.childElementCount === 0 - - if (!this.fileName) { - this.fileName = fileName; - } - - if (!filenameInput.value) { - filenameInput.value = this.fileName; - } - } - - preventIllegalChars(e) { - // const filenameInput = document.getElementById('filename-input'); - // - // filenameInput.value = filenameInput.value.replace('.pdf', ''); - // - // // prevent . - // if (filenameInput.value.includes('.')) { - // filenameInput.value.replace('.',''); - // } - } + preventIllegalChars(e) { + // const filenameInput = document.getElementById('filename-input'); + // + // filenameInput.value = filenameInput.value.replace('.pdf', ''); + // + // // prevent . + // if (filenameInput.value.includes('.')) { + // filenameInput.value.replace('.',''); + // } + } } export default PdfContainer; diff --git a/src/main/resources/static/js/multitool/fileInput.js b/src/main/resources/static/js/multitool/fileInput.js index ecaf64ed..77455c06 100644 --- a/src/main/resources/static/js/multitool/fileInput.js +++ b/src/main/resources/static/js/multitool/fileInput.js @@ -1,94 +1,95 @@ class FileDragManager { - overlay; - dragCounter; - updateFilename; + overlay; + dragCounter; + updateFilename; - constructor(cb = null) { - this.dragCounter = 0; - this.setCallback(cb); + constructor(cb = null) { + this.dragCounter = 0; + this.setCallback(cb); - // Prevent default behavior for drag events - ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => { - document.body.addEventListener(eventName, preventDefaults, false); - }); + // Prevent default behavior for drag events + ["dragenter", "dragover", "dragleave", "drop"].forEach((eventName) => { + document.body.addEventListener(eventName, preventDefaults, false); + }); - function preventDefaults(e) { - e.preventDefault(); - e.stopPropagation(); - } - - this.dragenterListener = this.dragenterListener.bind(this); - this.dragleaveListener = this.dragleaveListener.bind(this); - this.dropListener = this.dropListener.bind(this); - - document.body.addEventListener('dragenter', this.dragenterListener); - document.body.addEventListener('dragleave', this.dragleaveListener); - // Add drop event listener - document.body.addEventListener('drop', this.dropListener); + function preventDefaults(e) { + e.preventDefault(); + e.stopPropagation(); } - setActions({ updateFilename }) { - this.updateFilename = updateFilename; + this.dragenterListener = this.dragenterListener.bind(this); + this.dragleaveListener = this.dragleaveListener.bind(this); + this.dropListener = this.dropListener.bind(this); + + document.body.addEventListener("dragenter", this.dragenterListener); + document.body.addEventListener("dragleave", this.dragleaveListener); + // Add drop event listener + document.body.addEventListener("drop", this.dropListener); + } + + setActions({ updateFilename }) { + this.updateFilename = updateFilename; + } + + setCallback(cb) { + if (cb) { + this.callback = cb; + } else { + this.callback = (files) => console.warn("FileDragManager not set"); } + } - setCallback(cb) { - if (cb) { - this.callback = cb; - } else { - this.callback = (files) => console.warn("FileDragManager not set"); - } + dragenterListener() { + this.dragCounter++; + if (!this.overlay) { + // Create and show the overlay + this.overlay = document.createElement("div"); + this.overlay.style.position = "fixed"; + this.overlay.style.top = 0; + this.overlay.style.left = 0; + this.overlay.style.width = "100%"; + this.overlay.style.height = "100%"; + this.overlay.style.background = "rgba(0, 0, 0, 0.5)"; + this.overlay.style.color = "#fff"; + this.overlay.style.zIndex = "1000"; + this.overlay.style.display = "flex"; + this.overlay.style.alignItems = "center"; + this.overlay.style.justifyContent = "center"; + this.overlay.style.pointerEvents = "none"; + this.overlay.innerHTML = "

Drop files anywhere to upload

"; + document.getElementById("content-wrap").appendChild(this.overlay); } + } - dragenterListener() { - this.dragCounter++; - if (!this.overlay) { - // Create and show the overlay - this.overlay = document.createElement('div'); - this.overlay.style.position = 'fixed'; - this.overlay.style.top = 0; - this.overlay.style.left = 0; - this.overlay.style.width = '100%'; - this.overlay.style.height = '100%'; - this.overlay.style.background = 'rgba(0, 0, 0, 0.5)'; - this.overlay.style.color = '#fff'; - this.overlay.style.zIndex = '1000'; - this.overlay.style.display = 'flex'; - this.overlay.style.alignItems = 'center'; - this.overlay.style.justifyContent = 'center'; - this.overlay.style.pointerEvents = 'none'; - this.overlay.innerHTML = '

Drop files anywhere to upload

'; - document.getElementById('content-wrap').appendChild(this.overlay); + dragleaveListener() { + this.dragCounter--; + if (this.dragCounter === 0) { + // Hide and remove the overlay + if (this.overlay) { + this.overlay.remove(); + this.overlay = null; + } + } + } + + dropListener(e) { + const dt = e.dataTransfer; + const files = dt.files; + this.callback(files) + .catch((err) => { + console.error(err); + //maybe + }) + .finally(() => { + // Hide and remove the overlay + if (this.overlay) { + this.overlay.remove(); + this.overlay = null; } - }; - dragleaveListener() { - this.dragCounter--; - if (this.dragCounter === 0) { - // Hide and remove the overlay - if (this.overlay) { - this.overlay.remove(); - this.overlay = null; - } - } - }; - - dropListener(e) { - - const dt = e.dataTransfer; - const files = dt.files; - this.callback(files).catch((err) => { - console.error(err); - //maybe - }).finally(() => { - // Hide and remove the overlay - if (this.overlay) { - this.overlay.remove(); - this.overlay = null; - } - - this.updateFilename(files ? files[0].name : ""); - }); - }; + this.updateFilename(files ? files[0].name : ""); + }); + } } export default FileDragManager; diff --git a/src/main/resources/static/js/multitool/horizontalScroll.js b/src/main/resources/static/js/multitool/horizontalScroll.js index 1bbcfed0..2d20fd7b 100644 --- a/src/main/resources/static/js/multitool/horizontalScroll.js +++ b/src/main/resources/static/js/multitool/horizontalScroll.js @@ -1,35 +1,34 @@ const scrollDivHorizontally = (id) => { - var scrollDelta = 0; // variable to store the accumulated scroll delta - var isScrolling = false; // variable to track if scroll is already in progress - const divToScrollHorizontally = document.getElementById(id) - function scrollLoop() { - // Scroll the div horizontally by a fraction of the accumulated scroll delta - divToScrollHorizontally.scrollLeft += scrollDelta * 0.1; + var scrollDelta = 0; // variable to store the accumulated scroll delta + var isScrolling = false; // variable to track if scroll is already in progress + const divToScrollHorizontally = document.getElementById(id); + function scrollLoop() { + // Scroll the div horizontally by a fraction of the accumulated scroll delta + divToScrollHorizontally.scrollLeft += scrollDelta * 0.1; - // Reduce the accumulated scroll delta by a fraction - scrollDelta *= 0.9; + // Reduce the accumulated scroll delta by a fraction + scrollDelta *= 0.9; - // If scroll delta is still significant, continue the scroll loop - if (Math.abs(scrollDelta) > 0.1) { - requestAnimationFrame(scrollLoop); - } else { - isScrolling = false; // Reset scroll in progress flag - } + // If scroll delta is still significant, continue the scroll loop + if (Math.abs(scrollDelta) > 0.1) { + requestAnimationFrame(scrollLoop); + } else { + isScrolling = false; // Reset scroll in progress flag } + } + divToScrollHorizontally.addEventListener("wheel", function (e) { + e.preventDefault(); // prevent default mousewheel behavior - divToScrollHorizontally.addEventListener("wheel", function(e) { - e.preventDefault(); // prevent default mousewheel behavior + // Accumulate the horizontal scroll delta + scrollDelta -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY; - // Accumulate the horizontal scroll delta - scrollDelta -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY; - - // If scroll is not already in progress, start the scroll loop - if (!isScrolling) { - isScrolling = true; - requestAnimationFrame(scrollLoop); - } - }); -} + // If scroll is not already in progress, start the scroll loop + if (!isScrolling) { + isScrolling = true; + requestAnimationFrame(scrollLoop); + } + }); +}; export default scrollDivHorizontally; diff --git a/src/main/resources/static/js/pipeline.js b/src/main/resources/static/js/pipeline.js index e77c4d01..fcfd3df5 100644 --- a/src/main/resources/static/js/pipeline.js +++ b/src/main/resources/static/js/pipeline.js @@ -1,277 +1,261 @@ -document.getElementById('validateButton').addEventListener('click', function(event) { - event.preventDefault(); - validatePipeline(); +document.getElementById("validateButton").addEventListener("click", function (event) { + event.preventDefault(); + validatePipeline(); }); function validatePipeline() { - let pipelineListItems = document.getElementById('pipelineList').children; - let isValid = true; - let containsAddPassword = false; - for (let i = 0; i < pipelineListItems.length - 1; i++) { - let currentOperation = pipelineListItems[i].querySelector('.operationName').textContent; - let nextOperation = pipelineListItems[i + 1].querySelector('.operationName').textContent; - if (currentOperation === '/add-password') { - containsAddPassword = true; - } + let pipelineListItems = document.getElementById("pipelineList").children; + let isValid = true; + let containsAddPassword = false; + for (let i = 0; i < pipelineListItems.length - 1; i++) { + let currentOperation = pipelineListItems[i].querySelector(".operationName").textContent; + let nextOperation = pipelineListItems[i + 1].querySelector(".operationName").textContent; + if (currentOperation === "/add-password") { + containsAddPassword = true; + } - let currentOperationDescription = apiDocs[currentOperation]?.post?.description || ""; - let nextOperationDescription = apiDocs[nextOperation]?.post?.description || ""; + let currentOperationDescription = apiDocs[currentOperation]?.post?.description || ""; + let nextOperationDescription = apiDocs[nextOperation]?.post?.description || ""; - // Strip off 'ZIP-' prefix - currentOperationDescription = currentOperationDescription.replace("ZIP-", ''); - nextOperationDescription = nextOperationDescription.replace("ZIP-", ''); + // Strip off 'ZIP-' prefix + currentOperationDescription = currentOperationDescription.replace("ZIP-", ""); + nextOperationDescription = nextOperationDescription.replace("ZIP-", ""); - let currentOperationOutput = currentOperationDescription.match(/Output:([A-Z\/]*)/)?.[1] || ""; - let nextOperationInput = nextOperationDescription.match(/Input:([A-Z\/]*)/)?.[1] || ""; + let currentOperationOutput = currentOperationDescription.match(/Output:([A-Z\/]*)/)?.[1] || ""; + let nextOperationInput = nextOperationDescription.match(/Input:([A-Z\/]*)/)?.[1] || ""; - // Splitting in case of multiple possible output/input - let currentOperationOutputArr = currentOperationOutput.split('/'); - let nextOperationInputArr = nextOperationInput.split('/'); + // Splitting in case of multiple possible output/input + let currentOperationOutputArr = currentOperationOutput.split("/"); + let nextOperationInputArr = nextOperationInput.split("/"); - if (currentOperationOutput !== 'ANY' && nextOperationInput !== 'ANY') { - let intersection = currentOperationOutputArr.filter(value => nextOperationInputArr.includes(value)); - console.log(`Intersection: ${intersection}`); + if (currentOperationOutput !== "ANY" && nextOperationInput !== "ANY") { + let intersection = currentOperationOutputArr.filter((value) => nextOperationInputArr.includes(value)); + console.log(`Intersection: ${intersection}`); - if (intersection.length === 0) { - updateValidateButton(false); - isValid = false; - console.log(`Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`); - alert(`Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`); - break; - } - } - } - if (containsAddPassword && pipelineListItems[pipelineListItems.length - 1].querySelector('.operationName').textContent !== '/add-password') { - updateValidateButton(false); - alert('The "add-password" operation should be at the end of the operations sequence. Please adjust the operations order.'); - return false; - } - if (isValid) { - console.log('Pipeline is valid'); - // Continue with the pipeline operation - } else { - console.error('Pipeline is not valid'); - // Stop operation, maybe display an error to the user - } - updateValidateButton(isValid); - return isValid; + if (intersection.length === 0) { + updateValidateButton(false); + isValid = false; + console.log( + `Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`, + ); + alert( + `Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`, + ); + break; + } + } + } + if ( + containsAddPassword && + pipelineListItems[pipelineListItems.length - 1].querySelector(".operationName").textContent !== "/add-password" + ) { + updateValidateButton(false); + alert('The "add-password" operation should be at the end of the operations sequence. Please adjust the operations order.'); + return false; + } + if (isValid) { + console.log("Pipeline is valid"); + // Continue with the pipeline operation + } else { + console.error("Pipeline is not valid"); + // Stop operation, maybe display an error to the user + } + updateValidateButton(isValid); + return isValid; } function updateValidateButton(isValid) { - var validateButton = document.getElementById('validateButton'); - if (isValid) { - validateButton.classList.remove('btn-danger'); - validateButton.classList.add('btn-success'); - } else { - validateButton.classList.remove('btn-success'); - validateButton.classList.add('btn-danger'); - } + var validateButton = document.getElementById("validateButton"); + if (isValid) { + validateButton.classList.remove("btn-danger"); + validateButton.classList.add("btn-success"); + } else { + validateButton.classList.remove("btn-success"); + validateButton.classList.add("btn-danger"); + } } +document.getElementById("submitConfigBtn").addEventListener("click", function () { + if (validatePipeline() === false) { + return; + } + let selectedOperation = document.getElementById("operationsDropdown").value; + var pipelineName = document.getElementById("pipelineName").value; + let pipelineList = document.getElementById("pipelineList").children; + let pipelineConfig = { + name: pipelineName, + pipeline: [], + _examples: { + outputDir: "{outputFolder}/{folderName}", + outputFileName: "{filename}-{pipelineName}-{date}-{time}", + }, + outputDir: "httpWebRequest", + outputFileName: "{filename}", + }; + for (let i = 0; i < pipelineList.length; i++) { + let operationName = pipelineList[i].querySelector(".operationName").textContent; + let parameters = operationSettings[operationName] || {}; -document.getElementById('submitConfigBtn').addEventListener('click', function() { + pipelineConfig.pipeline.push({ + operation: operationName, + parameters: parameters, + }); + } - if (validatePipeline() === false) { - return; - } - let selectedOperation = document.getElementById('operationsDropdown').value; + let pipelineConfigJson = JSON.stringify(pipelineConfig, null, 2); + let formData = new FormData(); + let fileInput = document.getElementById("fileInput-input"); + let files = fileInput.files; - var pipelineName = document.getElementById('pipelineName').value; - let pipelineList = document.getElementById('pipelineList').children; - let pipelineConfig = { - "name": pipelineName, - "pipeline": [], - "_examples": { - "outputDir": "{outputFolder}/{folderName}", - "outputFileName": "{filename}-{pipelineName}-{date}-{time}" - }, - "outputDir": "httpWebRequest", - "outputFileName": "{filename}" - }; + for (let i = 0; i < files.length; i++) { + console.log("files[i]", files[i].name); + formData.append("fileInput", files[i], files[i].name); + } - for (let i = 0; i < pipelineList.length; i++) { - let operationName = pipelineList[i].querySelector('.operationName').textContent; - let parameters = operationSettings[operationName] || {}; + console.log("pipelineConfigJson", pipelineConfigJson); + formData.append("json", pipelineConfigJson); + console.log("formData", formData); - pipelineConfig.pipeline.push({ - "operation": operationName, - "parameters": parameters - }); - } + fetch("api/v1/pipeline/handleData", { + method: "POST", + body: formData, + }) + .then((response) => { + // Save the response to use it later + const responseToUseLater = response; + return response.blob().then((blob) => { + let url = window.URL.createObjectURL(blob); + let a = document.createElement("a"); + a.href = url; + // Use responseToUseLater instead of response + const contentDisposition = responseToUseLater.headers.get("Content-Disposition"); + let filename = "download"; + if (contentDisposition && contentDisposition.indexOf("attachment") !== -1) { + filename = decodeURIComponent(contentDisposition.split("filename=")[1].replace(/"/g, "")).trim(); + } + a.download = filename; - - - - - - - - - - - let pipelineConfigJson = JSON.stringify(pipelineConfig, null, 2); - - let formData = new FormData(); - - let fileInput = document.getElementById('fileInput-input'); - let files = fileInput.files; - - for (let i = 0; i < files.length; i++) { - console.log("files[i]", files[i].name); - formData.append('fileInput', files[i], files[i].name); - } - - console.log("pipelineConfigJson", pipelineConfigJson); - formData.append('json', pipelineConfigJson); - console.log("formData", formData); - - fetch('api/v1/pipeline/handleData', { - method: 'POST', - body: formData - }) - .then(response => { - // Save the response to use it later - const responseToUseLater = response; - - return response.blob().then(blob => { - let url = window.URL.createObjectURL(blob); - let a = document.createElement('a'); - a.href = url; - - // Use responseToUseLater instead of response - const contentDisposition = responseToUseLater.headers.get('Content-Disposition'); - let filename = 'download'; - if (contentDisposition && contentDisposition.indexOf('attachment') !== -1) { - filename = decodeURIComponent(contentDisposition.split('filename=')[1].replace(/"/g, '')).trim(); - } - a.download = filename; - - document.body.appendChild(a); - a.click(); - a.remove(); - }); - }) - .catch((error) => { - console.error('Error:', error); - }); - + document.body.appendChild(a); + a.click(); + a.remove(); + }); + }) + .catch((error) => { + console.error("Error:", error); + }); }); let apiDocs = {}; let apiSchemas = {}; let operationSettings = {}; -fetch('v1/api-docs') - .then(response => response.json()) - .then(data => { +fetch("v1/api-docs") + .then((response) => response.json()) + .then((data) => { + apiDocs = data.paths; + apiSchemas = data.components.schemas; + let operationsDropdown = document.getElementById("operationsDropdown"); + const ignoreOperations = ["/api/v1/pipeline/handleData", "/api/v1/pipeline/operationToIgnore"]; // Add the operations you want to ignore here - apiDocs = data.paths; - apiSchemas = data.components.schemas; - let operationsDropdown = document.getElementById('operationsDropdown'); - const ignoreOperations = ["/api/v1/pipeline/handleData", "/api/v1/pipeline/operationToIgnore"]; // Add the operations you want to ignore here + operationsDropdown.innerHTML = ""; - operationsDropdown.innerHTML = ''; + let operationsByTag = {}; - let operationsByTag = {}; + // Group operations by tags + Object.keys(data.paths).forEach((operationPath) => { + let operation = data.paths[operationPath].post; + if (!operation || !operation.description) { + console.log(operationPath); + } + //!operation.description.includes("Type:MISO") + if (operation && !ignoreOperations.includes(operationPath)) { + let operationTag = operation.tags[0]; // This assumes each operation has exactly one tag + if (!operationsByTag[operationTag]) { + operationsByTag[operationTag] = []; + } + operationsByTag[operationTag].push(operationPath); + } + }); - // Group operations by tags - Object.keys(data.paths).forEach(operationPath => { - let operation = data.paths[operationPath].post; - if (!operation || !operation.description) { - console.log(operationPath); - } - //!operation.description.includes("Type:MISO") - if (operation && !ignoreOperations.includes(operationPath)) { - let operationTag = operation.tags[0]; // This assumes each operation has exactly one tag - if (!operationsByTag[operationTag]) { - operationsByTag[operationTag] = []; - } - operationsByTag[operationTag].push(operationPath); - } - }); + // Sort operations within each tag alphabetically + Object.keys(operationsByTag).forEach((tag) => { + operationsByTag[tag].sort(); + }); - // Sort operations within each tag alphabetically - Object.keys(operationsByTag).forEach(tag => { - operationsByTag[tag].sort(); - }); + // Specify the order of tags + let tagOrder = ["General", "Security", "Convert", "Misc", "Filter"]; - // Specify the order of tags - let tagOrder = ["General", "Security", "Convert", "Misc", "Filter"]; + // Create dropdown options + tagOrder.forEach((tag) => { + if (operationsByTag[tag]) { + let group = document.createElement("optgroup"); + group.label = tag; - // Create dropdown options - tagOrder.forEach(tag => { - if (operationsByTag[tag]) { - let group = document.createElement('optgroup'); - group.label = tag; + operationsByTag[tag].forEach((operationPath) => { + let option = document.createElement("option"); - operationsByTag[tag].forEach(operationPath => { - let option = document.createElement('option'); + let operationPathDisplay = operationPath; + operationPathDisplay = operationPath.replace(new RegExp("api/v1/" + tag.toLowerCase() + "/", "i"), ""); - let operationPathDisplay = operationPath - operationPathDisplay = operationPath.replace(new RegExp("api/v1/" + tag.toLowerCase() + "/", 'i'), ""); + if (operationPath.includes("/convert")) { + operationPathDisplay = operationPathDisplay.replace(/^\//, "").replaceAll("/", " to "); + } else { + operationPathDisplay = operationPathDisplay.replace(/\//g, ""); // Remove slashes + } + operationPathDisplay = operationPathDisplay.replaceAll(" ", "-"); + option.textContent = operationPathDisplay; + option.value = operationPath; // Keep the value with slashes for querying + group.appendChild(option); + }); + operationsDropdown.appendChild(group); + } + }); + }); - if (operationPath.includes("/convert")) { - operationPathDisplay = operationPathDisplay.replace(/^\//, '').replaceAll("/", " to "); - } else { - operationPathDisplay = operationPathDisplay.replace(/\//g, ''); // Remove slashes - } - operationPathDisplay = operationPathDisplay.replaceAll(" ", "-"); - option.textContent = operationPathDisplay; - option.value = operationPath; // Keep the value with slashes for querying - group.appendChild(option); - }); +document.getElementById("addOperationBtn").addEventListener("click", function () { + let selectedOperation = document.getElementById("operationsDropdown").value; + let pipelineList = document.getElementById("pipelineList"); - operationsDropdown.appendChild(group); - } - }); - }); + let listItem = document.createElement("li"); + listItem.className = "list-group-item"; + let hasSettings = false; + if (apiDocs[selectedOperation] && apiDocs[selectedOperation].post) { + const postMethod = apiDocs[selectedOperation].post; + // Check if parameters exist + if (postMethod.parameters && postMethod.parameters.length > 0) { + hasSettings = true; + } else if (postMethod.requestBody && postMethod.requestBody.content["multipart/form-data"]) { + // Extract the reference key + const refKey = postMethod.requestBody.content["multipart/form-data"].schema["$ref"].split("/").pop(); + // Check if the referenced schema exists and has properties more than just its input file + if (apiSchemas[refKey]) { + const properties = apiSchemas[refKey].properties; + const propertyKeys = Object.keys(properties); -document.getElementById('addOperationBtn').addEventListener('click', function() { - let selectedOperation = document.getElementById('operationsDropdown').value; - let pipelineList = document.getElementById('pipelineList'); + // Check if there's more than one property or if there's exactly one property and its format is not 'binary' + if (propertyKeys.length > 1 || (propertyKeys.length === 1 && properties[propertyKeys[0]].format !== "binary")) { + hasSettings = true; + } + } + } + } - let listItem = document.createElement('li'); - listItem.className = "list-group-item"; - let hasSettings = false; - if (apiDocs[selectedOperation] && apiDocs[selectedOperation].post) { - const postMethod = apiDocs[selectedOperation].post; - - // Check if parameters exist - if (postMethod.parameters && postMethod.parameters.length > 0) { - hasSettings = true; - } else if (postMethod.requestBody && postMethod.requestBody.content['multipart/form-data']) { - // Extract the reference key - const refKey = postMethod.requestBody.content['multipart/form-data'].schema['$ref'].split('/').pop(); - // Check if the referenced schema exists and has properties more than just its input file - if (apiSchemas[refKey]) { - const properties = apiSchemas[refKey].properties; - const propertyKeys = Object.keys(properties); - - // Check if there's more than one property or if there's exactly one property and its format is not 'binary' - if (propertyKeys.length > 1 || (propertyKeys.length === 1 && properties[propertyKeys[0]].format !== 'binary')) { - hasSettings = true; - } - } - } - } - - - - - listItem.innerHTML = ` + listItem.innerHTML = `
${selectedOperation}
- @@ -279,393 +263,379 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
`; + pipelineList.appendChild(listItem); - pipelineList.appendChild(listItem); + listItem.querySelector(".move-up").addEventListener("click", function (event) { + event.preventDefault(); + if (listItem.previousElementSibling) { + pipelineList.insertBefore(listItem, listItem.previousElementSibling); + updateConfigInDropdown(); + } + }); - listItem.querySelector('.move-up').addEventListener('click', function(event) { - event.preventDefault(); - if (listItem.previousElementSibling) { - pipelineList.insertBefore(listItem, listItem.previousElementSibling); - updateConfigInDropdown(); - } - }); + listItem.querySelector(".move-down").addEventListener("click", function (event) { + event.preventDefault(); + if (listItem.nextElementSibling) { + pipelineList.insertBefore(listItem.nextElementSibling, listItem); + updateConfigInDropdown(); + } + }); - listItem.querySelector('.move-down').addEventListener('click', function(event) { - event.preventDefault(); - if (listItem.nextElementSibling) { - pipelineList.insertBefore(listItem.nextElementSibling, listItem); - updateConfigInDropdown(); - } + listItem.querySelector(".remove").addEventListener("click", function (event) { + event.preventDefault(); + pipelineList.removeChild(listItem); + hideOrShowPipelineHeader(); + updateConfigInDropdown(); + }); - }); + listItem.querySelector(".pipelineSettings").addEventListener("click", function (event) { + event.preventDefault(); + showpipelineSettingsModal(selectedOperation); + hideOrShowPipelineHeader(); + }); - listItem.querySelector('.remove').addEventListener('click', function(event) { - event.preventDefault(); - pipelineList.removeChild(listItem); - hideOrShowPipelineHeader(); - updateConfigInDropdown(); - }); + function showpipelineSettingsModal(operation) { + let pipelineSettingsModal = document.getElementById("pipelineSettingsModal"); + let pipelineSettingsContent = document.getElementById("pipelineSettingsContent"); + let operationData = apiDocs[operation].post.parameters || []; - listItem.querySelector('.pipelineSettings').addEventListener('click', function(event) { - event.preventDefault(); - showpipelineSettingsModal(selectedOperation); - hideOrShowPipelineHeader(); - }); + // Resolve the $ref reference to get actual schema properties + let refKey = apiDocs[operation].post.requestBody.content["multipart/form-data"].schema["$ref"].split("/").pop(); + let requestBodyData = apiSchemas[refKey].properties || {}; - function showpipelineSettingsModal(operation) { - let pipelineSettingsModal = document.getElementById('pipelineSettingsModal'); - let pipelineSettingsContent = document.getElementById('pipelineSettingsContent'); - let operationData = apiDocs[operation].post.parameters || []; + // Combine operationData and requestBodyData into a single array + operationData = operationData.concat( + Object.keys(requestBodyData).map((key) => ({ + name: key, + schema: requestBodyData[key], + })), + ); - // Resolve the $ref reference to get actual schema properties - let refKey = apiDocs[operation].post.requestBody.content['multipart/form-data'].schema['$ref'].split('/').pop(); - let requestBodyData = apiSchemas[refKey].properties || {}; + pipelineSettingsContent.innerHTML = ""; - // Combine operationData and requestBodyData into a single array - operationData = operationData.concat(Object.keys(requestBodyData).map(key => ({ - name: key, - schema: requestBodyData[key] - }))); + operationData.forEach((parameter) => { + // If the parameter name is 'fileInput', return early to skip the rest of this iteration + if (parameter.name === "fileInput") return; - pipelineSettingsContent.innerHTML = ''; + let parameterDiv = document.createElement("div"); + parameterDiv.className = "mb-3"; - operationData.forEach(parameter => { - // If the parameter name is 'fileInput', return early to skip the rest of this iteration - if (parameter.name === 'fileInput') return; + let parameterLabel = document.createElement("label"); + parameterLabel.textContent = `${parameter.name} (${parameter.schema.type}): `; + parameterLabel.title = parameter.schema.description; + parameterLabel.setAttribute("for", parameter.name); + parameterDiv.appendChild(parameterLabel); - let parameterDiv = document.createElement('div'); - parameterDiv.className = "mb-3"; + let defaultValue = parameter.schema.example; + if (defaultValue === undefined) defaultValue = parameter.schema.default; - let parameterLabel = document.createElement('label'); - parameterLabel.textContent = `${parameter.name} (${parameter.schema.type}): `; - parameterLabel.title = parameter.schema.description; - parameterLabel.setAttribute('for', parameter.name); - parameterDiv.appendChild(parameterLabel); + let parameterInput; - let defaultValue = parameter.schema.example; - if (defaultValue === undefined) defaultValue = parameter.schema.default; + // check if enum exists in schema + if (parameter.schema.enum) { + // if enum exists, create a select element + parameterInput = document.createElement("select"); + parameterInput.className = "form-control"; - let parameterInput; + // iterate over each enum value and create an option for it + parameter.schema.enum.forEach((value) => { + let option = document.createElement("option"); + option.value = value; + option.text = value; + parameterInput.appendChild(option); + }); + } else { + // switch-case statement for handling non-enum types + switch (parameter.schema.type) { + case "string": + if (parameter.schema.format === "binary") { + // This is a file input - // check if enum exists in schema - if (parameter.schema.enum) { - // if enum exists, create a select element - parameterInput = document.createElement('select'); - parameterInput.className = "form-control"; - - // iterate over each enum value and create an option for it - parameter.schema.enum.forEach(value => { - let option = document.createElement('option'); - option.value = value; - option.text = value; - parameterInput.appendChild(option); - }); - } else { - // switch-case statement for handling non-enum types - switch (parameter.schema.type) { - case 'string': - if (parameter.schema.format === 'binary') { - // This is a file input - - //parameterInput = document.createElement('input'); - //parameterInput.type = 'file'; - //parameterInput.className = "form-control"; - - parameterInput = document.createElement('input'); - parameterInput.type = 'text'; - parameterInput.className = "form-control"; - parameterInput.value = "FileInputPathToBeInputtedManuallyForOffline"; - } else { - parameterInput = document.createElement('input'); - parameterInput.type = 'text'; - parameterInput.className = "form-control"; - if (defaultValue !== undefined) parameterInput.value = defaultValue; - } - break; - case 'number': - case 'integer': - parameterInput = document.createElement('input'); - parameterInput.type = 'number'; - parameterInput.className = "form-control"; - if (defaultValue !== undefined) parameterInput.value = defaultValue; - break; - case 'boolean': - parameterInput = document.createElement('input'); - parameterInput.type = 'checkbox'; - if (defaultValue === true) parameterInput.checked = true; - break; - case 'array': - case 'object': - //TODO compare to doc and check if fileInput array? parameter.schema.format === 'binary' - parameterInput = document.createElement('textarea'); - parameterInput.placeholder = `Enter a JSON formatted ${parameter.schema.type}, If this is a fileInput, it is not currently supported`; - parameterInput.className = "form-control"; - break; - default: - parameterInput = document.createElement('input'); - parameterInput.type = 'text'; - parameterInput.className = "form-control"; - if (defaultValue !== undefined) parameterInput.value = defaultValue; - } - } - parameterInput.id = parameter.name; - - console.log("defaultValue", defaultValue); - console.log("parameterInput", parameterInput); - if (operationSettings[operation] && operationSettings[operation][parameter.name] !== undefined) { - let savedValue = operationSettings[operation][parameter.name]; - - switch (parameter.schema.type) { - case 'number': - case 'integer': - parameterInput.value = savedValue.toString(); - break; - case 'boolean': - parameterInput.checked = savedValue; - break; - case 'array': - case 'object': - parameterInput.value = JSON.stringify(savedValue); - break; - default: - parameterInput.value = savedValue; - } - } - console.log("parameterInput2", parameterInput); - parameterDiv.appendChild(parameterInput); - - pipelineSettingsContent.appendChild(parameterDiv); - }); - - if(hasSettings) { - let saveButton = document.createElement('button'); - saveButton.textContent = saveSettings; - saveButton.className = "btn btn-primary"; - saveButton.addEventListener('click', function(event) { - event.preventDefault(); - let settings = {}; - operationData.forEach(parameter => { - if (parameter.name !== "fileInput") { - let value = document.getElementById(parameter.name).value; - switch (parameter.schema.type) { - case 'number': - case 'integer': - settings[parameter.name] = Number(value); - break; - case 'boolean': - settings[parameter.name] = document.getElementById(parameter.name).checked; - break; - case 'array': - case 'object': - if (value === null || value === '') { - settings[parameter.name] = ''; - } else { - try { - settings[parameter.name] = JSON.parse(value); - } catch (err) { - console.error(`Invalid JSON format for ${parameter.name}`); - } - } - break; - default: - settings[parameter.name] = value; - } - } - }); - operationSettings[operation] = settings; - //pipelineSettingsModal.style.display = "none"; - }); - pipelineSettingsContent.appendChild(saveButton); - saveButton.click(); - } - //pipelineSettingsModal.style.display = "block"; - - //pipelineSettingsModal.getElementsByClassName("close")[0].onclick = function() { - // pipelineSettingsModal.style.display = "none"; - //} - - //window.onclick = function(event) { - // if (event.target == pipelineSettingsModal) { - // pipelineSettingsModal.style.display = "none"; - // } - //} - } - showpipelineSettingsModal(selectedOperation); - updateConfigInDropdown(); - hideOrShowPipelineHeader(); + //parameterInput = document.createElement('input'); + //parameterInput.type = 'file'; + //parameterInput.className = "form-control"; + parameterInput = document.createElement("input"); + parameterInput.type = "text"; + parameterInput.className = "form-control"; + parameterInput.value = "FileInputPathToBeInputtedManuallyForOffline"; + } else { + parameterInput = document.createElement("input"); + parameterInput.type = "text"; + parameterInput.className = "form-control"; + if (defaultValue !== undefined) parameterInput.value = defaultValue; + } + break; + case "number": + case "integer": + parameterInput = document.createElement("input"); + parameterInput.type = "number"; + parameterInput.className = "form-control"; + if (defaultValue !== undefined) parameterInput.value = defaultValue; + break; + case "boolean": + parameterInput = document.createElement("input"); + parameterInput.type = "checkbox"; + if (defaultValue === true) parameterInput.checked = true; + break; + case "array": + case "object": + //TODO compare to doc and check if fileInput array? parameter.schema.format === 'binary' + parameterInput = document.createElement("textarea"); + parameterInput.placeholder = `Enter a JSON formatted ${parameter.schema.type}, If this is a fileInput, it is not currently supported`; + parameterInput.className = "form-control"; + break; + default: + parameterInput = document.createElement("input"); + parameterInput.type = "text"; + parameterInput.className = "form-control"; + if (defaultValue !== undefined) parameterInput.value = defaultValue; + } + } + parameterInput.id = parameter.name; + console.log("defaultValue", defaultValue); + console.log("parameterInput", parameterInput); + if (operationSettings[operation] && operationSettings[operation][parameter.name] !== undefined) { + let savedValue = operationSettings[operation][parameter.name]; + switch (parameter.schema.type) { + case "number": + case "integer": + parameterInput.value = savedValue.toString(); + break; + case "boolean": + parameterInput.checked = savedValue; + break; + case "array": + case "object": + parameterInput.value = JSON.stringify(savedValue); + break; + default: + parameterInput.value = savedValue; + } + } + console.log("parameterInput2", parameterInput); + parameterDiv.appendChild(parameterInput); + pipelineSettingsContent.appendChild(parameterDiv); + }); + if (hasSettings) { + let saveButton = document.createElement("button"); + saveButton.textContent = saveSettings; + saveButton.className = "btn btn-primary"; + saveButton.addEventListener("click", function (event) { + event.preventDefault(); + let settings = {}; + operationData.forEach((parameter) => { + if (parameter.name !== "fileInput") { + let value = document.getElementById(parameter.name).value; + switch (parameter.schema.type) { + case "number": + case "integer": + settings[parameter.name] = Number(value); + break; + case "boolean": + settings[parameter.name] = document.getElementById(parameter.name).checked; + break; + case "array": + case "object": + if (value === null || value === "") { + settings[parameter.name] = ""; + } else { + try { + settings[parameter.name] = JSON.parse(value); + } catch (err) { + console.error(`Invalid JSON format for ${parameter.name}`); + } + } + break; + default: + settings[parameter.name] = value; + } + } + }); + operationSettings[operation] = settings; + //pipelineSettingsModal.style.display = "none"; + }); + pipelineSettingsContent.appendChild(saveButton); + saveButton.click(); + } + //pipelineSettingsModal.style.display = "block"; + //pipelineSettingsModal.getElementsByClassName("close")[0].onclick = function() { + // pipelineSettingsModal.style.display = "none"; + //} + //window.onclick = function(event) { + // if (event.target == pipelineSettingsModal) { + // pipelineSettingsModal.style.display = "none"; + // } + //} + } + showpipelineSettingsModal(selectedOperation); + updateConfigInDropdown(); + hideOrShowPipelineHeader(); }); function updateConfigInDropdown() { - let pipelineSelect = document.getElementById('pipelineSelect'); - let selectedOption = pipelineSelect.options[pipelineSelect.selectedIndex]; + let pipelineSelect = document.getElementById("pipelineSelect"); + let selectedOption = pipelineSelect.options[pipelineSelect.selectedIndex]; - // Get the current configuration as JSON - let pipelineConfigJson = configToJson(); - console.log("pipelineConfigJson", pipelineConfigJson); - if (!pipelineConfigJson) { - console.error("Failed to update configuration: Invalid configuration"); - return; - } - - // Update the value of the selected option with the new configuration - selectedOption.value = pipelineConfigJson; + // Get the current configuration as JSON + let pipelineConfigJson = configToJson(); + console.log("pipelineConfigJson", pipelineConfigJson); + if (!pipelineConfigJson) { + console.error("Failed to update configuration: Invalid configuration"); + return; + } + // Update the value of the selected option with the new configuration + selectedOption.value = pipelineConfigJson; } -var saveBtn = document.getElementById('savePipelineBtn'); +var saveBtn = document.getElementById("savePipelineBtn"); // Remove any existing event listeners -saveBtn.removeEventListener('click', savePipeline); +saveBtn.removeEventListener("click", savePipeline); // Add the event listener -saveBtn.addEventListener('click', savePipeline); -console.log("saveBtn", saveBtn) +saveBtn.addEventListener("click", savePipeline); +console.log("saveBtn", saveBtn); function configToJson() { - if (!validatePipeline()) { - return null; // Return null if validation fails - } + if (!validatePipeline()) { + return null; // Return null if validation fails + } - var pipelineName = document.getElementById('pipelineName').value; - let pipelineList = document.getElementById('pipelineList').children; - let pipelineConfig = { - "name": pipelineName, - "pipeline": [], - "_examples": { - "outputDir": "{outputFolder}/{folderName}", - "outputFileName": "{filename}-{pipelineName}-{date}-{time}" - }, - "outputDir": "{outputFolder}", - "outputFileName": "{filename}" - }; + var pipelineName = document.getElementById("pipelineName").value; + let pipelineList = document.getElementById("pipelineList").children; + let pipelineConfig = { + name: pipelineName, + pipeline: [], + _examples: { + outputDir: "{outputFolder}/{folderName}", + outputFileName: "{filename}-{pipelineName}-{date}-{time}", + }, + outputDir: "{outputFolder}", + outputFileName: "{filename}", + }; - for (let i = 0; i < pipelineList.length; i++) { - let operationName = pipelineList[i].querySelector('.operationName').textContent; - let parameters = operationSettings[operationName] || {}; + for (let i = 0; i < pipelineList.length; i++) { + let operationName = pipelineList[i].querySelector(".operationName").textContent; + let parameters = operationSettings[operationName] || {}; - parameters['fileInput'] = 'automated'; + parameters["fileInput"] = "automated"; - pipelineConfig.pipeline.push({ - "operation": operationName, - "parameters": parameters - }); - } + pipelineConfig.pipeline.push({ + operation: operationName, + parameters: parameters, + }); + } - return JSON.stringify(pipelineConfig, null, 2); + return JSON.stringify(pipelineConfig, null, 2); } - - function savePipeline() { - let pipelineConfigJson = configToJson(); - if (!pipelineConfigJson) { - console.error("Failed to save pipeline: Invalid configuration"); - return; - } + let pipelineConfigJson = configToJson(); + if (!pipelineConfigJson) { + console.error("Failed to save pipeline: Invalid configuration"); + return; + } - let pipelineName = document.getElementById('pipelineName').value; - console.log("Downloading..."); - let a = document.createElement('a'); - a.href = URL.createObjectURL(new Blob([pipelineConfigJson], { type: 'application/json' })); - a.download = pipelineName + '.json'; - a.style.display = 'none'; + let pipelineName = document.getElementById("pipelineName").value; + console.log("Downloading..."); + let a = document.createElement("a"); + a.href = URL.createObjectURL(new Blob([pipelineConfigJson], { type: "application/json" })); + a.download = pipelineName + ".json"; + a.style.display = "none"; - document.body.appendChild(a); - a.click(); - document.body.removeChild(a); + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); } - async function processPipelineConfig(configString) { - console.log("configString", configString); - let pipelineConfig = JSON.parse(configString); - let pipelineList = document.getElementById('pipelineList'); + console.log("configString", configString); + let pipelineConfig = JSON.parse(configString); + let pipelineList = document.getElementById("pipelineList"); - while (pipelineList.firstChild) { - pipelineList.removeChild(pipelineList.firstChild); - } - document.getElementById('pipelineName').value = pipelineConfig.name - for (const operationConfig of pipelineConfig.pipeline) { - let operationsDropdown = document.getElementById('operationsDropdown'); - operationsDropdown.value = operationConfig.operation; - operationSettings[operationConfig.operation] = operationConfig.parameters; + while (pipelineList.firstChild) { + pipelineList.removeChild(pipelineList.firstChild); + } + document.getElementById("pipelineName").value = pipelineConfig.name; + for (const operationConfig of pipelineConfig.pipeline) { + let operationsDropdown = document.getElementById("operationsDropdown"); + operationsDropdown.value = operationConfig.operation; + operationSettings[operationConfig.operation] = operationConfig.parameters; - // assuming addOperation is async - await new Promise((resolve) => { - document.getElementById('addOperationBtn').addEventListener('click', resolve, { once: true }); - document.getElementById('addOperationBtn').click(); - }); + // assuming addOperation is async + await new Promise((resolve) => { + document.getElementById("addOperationBtn").addEventListener("click", resolve, { once: true }); + document.getElementById("addOperationBtn").click(); + }); - let lastOperation = pipelineList.lastChild; + let lastOperation = pipelineList.lastChild; - Object.keys(operationConfig.parameters).forEach(parameterName => { - let input = document.getElementById(parameterName); - if (input) { - switch (input.type) { - case 'checkbox': - input.checked = operationConfig.parameters[parameterName]; - break; - case 'number': - input.value = operationConfig.parameters[parameterName].toString(); - break; - case 'file': - if (parameterName !== 'fileInput') { - // Create a new file input element - let newInput = document.createElement('input'); - newInput.type = 'file'; - newInput.id = parameterName; + Object.keys(operationConfig.parameters).forEach((parameterName) => { + let input = document.getElementById(parameterName); + if (input) { + switch (input.type) { + case "checkbox": + input.checked = operationConfig.parameters[parameterName]; + break; + case "number": + input.value = operationConfig.parameters[parameterName].toString(); + break; + case "file": + if (parameterName !== "fileInput") { + // Create a new file input element + let newInput = document.createElement("input"); + newInput.type = "file"; + newInput.id = parameterName; - // Add the new file input to the main page (change the selector according to your needs) - document.querySelector('#main').appendChild(newInput); - } - break; - case 'text': - case 'textarea': - default: - input.value = JSON.stringify(operationConfig.parameters[parameterName]); - } - } - }); - - } + // Add the new file input to the main page (change the selector according to your needs) + document.querySelector("#main").appendChild(newInput); + } + break; + case "text": + case "textarea": + default: + input.value = JSON.stringify(operationConfig.parameters[parameterName]); + } + } + }); + } } - -document.getElementById('uploadPipelineBtn').addEventListener('click', function() { - document.getElementById('uploadPipelineInput').click(); +document.getElementById("uploadPipelineBtn").addEventListener("click", function () { + document.getElementById("uploadPipelineInput").click(); }); -document.getElementById('uploadPipelineInput').addEventListener('change', function(e) { - let reader = new FileReader(); - reader.onload = function(event) { - processPipelineConfig(event.target.result); - }; - reader.readAsText(e.target.files[0]); - hideOrShowPipelineHeader(); +document.getElementById("uploadPipelineInput").addEventListener("change", function (e) { + let reader = new FileReader(); + reader.onload = function (event) { + processPipelineConfig(event.target.result); + }; + reader.readAsText(e.target.files[0]); + hideOrShowPipelineHeader(); }); -document.getElementById('pipelineSelect').addEventListener('change', function(e) { - let selectedPipelineJson = e.target.value; // assuming the selected value is the JSON string of the pipeline config - processPipelineConfig(selectedPipelineJson); +document.getElementById("pipelineSelect").addEventListener("change", function (e) { + let selectedPipelineJson = e.target.value; // assuming the selected value is the JSON string of the pipeline config + processPipelineConfig(selectedPipelineJson); }); - function hideOrShowPipelineHeader() { - var pipelineHeader = document.getElementById('pipelineHeader'); - var pipelineList = document.getElementById('pipelineList'); + var pipelineHeader = document.getElementById("pipelineHeader"); + var pipelineList = document.getElementById("pipelineList"); - if (pipelineList.children.length === 0) { - // Hide the pipeline header if there are no items in the pipeline list - pipelineHeader.style.display = 'none'; - } else { - // Show the pipeline header if there are items in the pipeline list - pipelineHeader.style.display = 'block'; - } + if (pipelineList.children.length === 0) { + // Hide the pipeline header if there are no items in the pipeline list + pipelineHeader.style.display = "none"; + } else { + // Show the pipeline header if there are items in the pipeline list + pipelineHeader.style.display = "block"; + } } diff --git a/src/main/resources/static/js/search.js b/src/main/resources/static/js/search.js index 674b54b7..2329f998 100644 --- a/src/main/resources/static/js/search.js +++ b/src/main/resources/static/js/search.js @@ -1,75 +1,76 @@ // Toggle search bar when the search icon is clicked -document.querySelector('#search-icon').addEventListener('click', function(e) { - e.preventDefault(); - var searchBar = document.querySelector('#navbarSearch'); - searchBar.classList.toggle('show'); +document.querySelector("#search-icon").addEventListener("click", function (e) { + e.preventDefault(); + var searchBar = document.querySelector("#navbarSearch"); + searchBar.classList.toggle("show"); }); -window.onload = function() { - var items = document.querySelectorAll('.dropdown-item, .nav-link'); - var dummyContainer = document.createElement('div'); - dummyContainer.style.position = 'absolute'; - dummyContainer.style.visibility = 'hidden'; - dummyContainer.style.whiteSpace = 'nowrap'; // Ensure we measure full width - document.body.appendChild(dummyContainer); +window.onload = function () { + var items = document.querySelectorAll(".dropdown-item, .nav-link"); + var dummyContainer = document.createElement("div"); + dummyContainer.style.position = "absolute"; + dummyContainer.style.visibility = "hidden"; + dummyContainer.style.whiteSpace = "nowrap"; // Ensure we measure full width + document.body.appendChild(dummyContainer); - var maxWidth = 0; + var maxWidth = 0; - items.forEach(function(item) { - var clone = item.cloneNode(true); - dummyContainer.appendChild(clone); - var width = clone.offsetWidth; - if (width > maxWidth) { - maxWidth = width; - } - dummyContainer.removeChild(clone); - }); + items.forEach(function (item) { + var clone = item.cloneNode(true); + dummyContainer.appendChild(clone); + var width = clone.offsetWidth; + if (width > maxWidth) { + maxWidth = width; + } + dummyContainer.removeChild(clone); + }); - document.body.removeChild(dummyContainer); + document.body.removeChild(dummyContainer); - // Store max width for later use - window.navItemMaxWidth = maxWidth; + // Store max width for later use + window.navItemMaxWidth = maxWidth; }; // Show search results as user types in search box -document.querySelector('#navbarSearchInput').addEventListener('input', function(e) { - var searchText = e.target.value.toLowerCase(); - var items = document.querySelectorAll('.dropdown-item, .nav-link'); - var resultsBox = document.querySelector('#searchResults'); +document.querySelector("#navbarSearchInput").addEventListener("input", function (e) { + var searchText = e.target.value.toLowerCase(); + var items = document.querySelectorAll(".dropdown-item, .nav-link"); + var resultsBox = document.querySelector("#searchResults"); - // Clear any previous results - resultsBox.innerHTML = ''; + // Clear any previous results + resultsBox.innerHTML = ""; - items.forEach(function(item) { - var titleElement = item.querySelector('.icon-text'); - var iconElement = item.querySelector('.icon'); - var itemHref = item.getAttribute('href'); - var tags = item.getAttribute('data-bs-tags') || ""; // If no tags, default to empty string + items.forEach(function (item) { + var titleElement = item.querySelector(".icon-text"); + var iconElement = item.querySelector(".icon"); + 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 ((title.toLowerCase().indexOf(searchText) !== -1 || tags.toLowerCase().indexOf(searchText) !== -1) && !resultsBox.querySelector(`a[href="${item.getAttribute('href')}"]`)) { - var result = document.createElement('a'); - result.href = itemHref; - result.classList.add('dropdown-item'); + if (titleElement && iconElement && itemHref !== "#") { + var title = titleElement.innerText; + if ( + (title.toLowerCase().indexOf(searchText) !== -1 || tags.toLowerCase().indexOf(searchText) !== -1) && + !resultsBox.querySelector(`a[href="${item.getAttribute("href")}"]`) + ) { + var result = document.createElement("a"); + result.href = itemHref; + result.classList.add("dropdown-item"); - var resultIcon = document.createElement('img'); - resultIcon.src = iconElement.src; - resultIcon.alt = 'icon'; - resultIcon.classList.add('icon'); - result.appendChild(resultIcon); + var resultIcon = document.createElement("img"); + resultIcon.src = iconElement.src; + resultIcon.alt = "icon"; + resultIcon.classList.add("icon"); + result.appendChild(resultIcon); - var resultText = document.createElement('span'); - resultText.textContent = title; - resultText.classList.add('icon-text'); - result.appendChild(resultText); + var resultText = document.createElement("span"); + resultText.textContent = title; + resultText.classList.add("icon-text"); + result.appendChild(resultText); - resultsBox.appendChild(result); - } - } - }); + resultsBox.appendChild(result); + } + } + }); - // Set the width of the search results box to the maximum width - resultsBox.style.width = window.navItemMaxWidth + 'px'; + // Set the width of the search results box to the maximum width + resultsBox.style.width = window.navItemMaxWidth + "px"; }); - - diff --git a/src/main/resources/static/js/settings.js b/src/main/resources/static/js/settings.js index 272b555b..77a55a3f 100644 --- a/src/main/resources/static/js/settings.js +++ b/src/main/resources/static/js/settings.js @@ -1,42 +1,33 @@ // Get the download option from local storage, or set it to 'sameWindow' if it doesn't exist -var downloadOption = localStorage.getItem('downloadOption') - || 'sameWindow'; +var downloadOption = localStorage.getItem("downloadOption") || "sameWindow"; // Set the selected option in the dropdown -document.getElementById('downloadOption').value = downloadOption; - +document.getElementById("downloadOption").value = downloadOption; // Save the selected option to local storage when the dropdown value changes -document.getElementById('downloadOption').addEventListener( - 'change', - function() { - downloadOption = this.value; - localStorage.setItem('downloadOption', - downloadOption); - }); - - -// Get the zipThreshold value from local storage, or set it to 0 if it doesn't exist -var zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4; - -// Set the value of the slider and the display span -document.getElementById('zipThreshold').value = zipThreshold; -document.getElementById('zipThresholdValue').textContent = zipThreshold; - - - -// Save the selected value to local storage when the slider value changes -document.getElementById('zipThreshold').addEventListener('input', function() { - zipThreshold = this.value; - document.getElementById('zipThresholdValue').textContent = zipThreshold; - localStorage.setItem('zipThreshold', zipThreshold); +document.getElementById("downloadOption").addEventListener("change", function () { + downloadOption = this.value; + localStorage.setItem("downloadOption", downloadOption); }); +// Get the zipThreshold value from local storage, or set it to 0 if it doesn't exist +var zipThreshold = parseInt(localStorage.getItem("zipThreshold"), 10) || 4; -var boredWaiting = localStorage.getItem('boredWaiting') || 'disabled'; -document.getElementById('boredWaiting').checked = boredWaiting === 'enabled'; +// Set the value of the slider and the display span +document.getElementById("zipThreshold").value = zipThreshold; +document.getElementById("zipThresholdValue").textContent = zipThreshold; -document.getElementById('boredWaiting').addEventListener('change', function() { - boredWaiting = this.checked ? 'enabled' : 'disabled'; - localStorage.setItem('boredWaiting', boredWaiting); -}); \ No newline at end of file +// Save the selected value to local storage when the slider value changes +document.getElementById("zipThreshold").addEventListener("input", function () { + zipThreshold = this.value; + document.getElementById("zipThresholdValue").textContent = zipThreshold; + localStorage.setItem("zipThreshold", zipThreshold); +}); + +var boredWaiting = localStorage.getItem("boredWaiting") || "disabled"; +document.getElementById("boredWaiting").checked = boredWaiting === "enabled"; + +document.getElementById("boredWaiting").addEventListener("change", function () { + boredWaiting = this.checked ? "enabled" : "disabled"; + localStorage.setItem("boredWaiting", boredWaiting); +}); diff --git a/src/main/resources/static/js/tab-container.js b/src/main/resources/static/js/tab-container.js index bd97d2b6..2aa85b32 100644 --- a/src/main/resources/static/js/tab-container.js +++ b/src/main/resources/static/js/tab-container.js @@ -1,39 +1,38 @@ - TabContainer = { - initTabGroups() { - const groups = document.querySelectorAll(".tab-group"); - const unloadedGroups = [...groups].filter(g => !g.initialised); - unloadedGroups.forEach(group => { - const containers = group.querySelectorAll(".tab-container"); - const tabTitles = [...containers].map(c => c.getAttribute("title")); + initTabGroups() { + const groups = document.querySelectorAll(".tab-group"); + const unloadedGroups = [...groups].filter((g) => !g.initialised); + unloadedGroups.forEach((group) => { + const containers = group.querySelectorAll(".tab-container"); + const tabTitles = [...containers].map((c) => c.getAttribute("title")); - const tabList = document.createElement("div"); - tabList.classList.add("tab-buttons"); - tabTitles.forEach(title => { - const tabButton = document.createElement("button"); - tabButton.innerHTML = title; - tabButton.onclick = e => { - this.setActiveTab(e.target); - } - tabList.appendChild(tabButton); - }); - group.prepend(tabList); + const tabList = document.createElement("div"); + tabList.classList.add("tab-buttons"); + tabTitles.forEach((title) => { + const tabButton = document.createElement("button"); + tabButton.innerHTML = title; + tabButton.onclick = (e) => { + this.setActiveTab(e.target); + }; + tabList.appendChild(tabButton); + }); + group.prepend(tabList); - this.setActiveTab(tabList.firstChild); + this.setActiveTab(tabList.firstChild); - group.initialised = true; - }); - }, - setActiveTab(tabButton) { - const group = tabButton.closest(".tab-group") + group.initialised = true; + }); + }, + setActiveTab(tabButton) { + const group = tabButton.closest(".tab-group"); - group.querySelectorAll(".active").forEach(el => el.classList.remove("active")); + group.querySelectorAll(".active").forEach((el) => el.classList.remove("active")); - tabButton.classList.add("active"); - group.querySelector(`[title="${tabButton.innerHTML}"]`).classList.add("active"); - }, -} + tabButton.classList.add("active"); + group.querySelector(`[title="${tabButton.innerHTML}"]`).classList.add("active"); + }, +}; document.addEventListener("DOMContentLoaded", () => { - TabContainer.initTabGroups(); -}) \ No newline at end of file + TabContainer.initTabGroups(); +}); diff --git a/src/main/resources/static/pdfjs/css/viewer.css b/src/main/resources/static/pdfjs/css/viewer.css index 14a8aff0..ab0ad406 100644 --- a/src/main/resources/static/pdfjs/css/viewer.css +++ b/src/main/resources/static/pdfjs/css/viewer.css @@ -116,7 +116,6 @@ top: 0; } - :root { --annotation-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,"); --input-focus-border-color: Highlight; @@ -139,9 +138,7 @@ .annotationLayer .textWidgetAnnotation :is(input, textarea):required, .annotationLayer .choiceWidgetAnnotation select:required, - .annotationLayer - .buttonWidgetAnnotation:is(.checkBox, .radioButton) - input:required { + .annotationLayer .buttonWidgetAnnotation:is(.checkBox, .radioButton) input:required { outline: 1.5px solid selectedItem; } @@ -228,9 +225,7 @@ height: 100%; } -.annotationLayer -:is(.linkAnnotation, .buttonWidgetAnnotation.pushButton):not(.hasBorder) -> a:hover { +.annotationLayer :is(.linkAnnotation, .buttonWidgetAnnotation.pushButton):not(.hasBorder) > a:hover { opacity: 0.2; background-color: rgba(255, 255, 0, 1); box-shadow: 0 2px 10px rgba(255, 255, 0, 1); @@ -268,9 +263,7 @@ .annotationLayer .textWidgetAnnotation :is(input, textarea):required, .annotationLayer .choiceWidgetAnnotation select:required, -.annotationLayer -.buttonWidgetAnnotation:is(.checkBox, .radioButton) -input:required { +.annotationLayer .buttonWidgetAnnotation:is(.checkBox, .radioButton) input:required { outline: 1.5px solid red; } @@ -288,9 +281,7 @@ input:required { .annotationLayer .textWidgetAnnotation :is(input, textarea)[disabled], .annotationLayer .choiceWidgetAnnotation select[disabled], -.annotationLayer -.buttonWidgetAnnotation:is(.checkBox, .radioButton) -input[disabled] { +.annotationLayer .buttonWidgetAnnotation:is(.checkBox, .radioButton) input[disabled] { background: none; border: 2px solid var(--input-disabled-border-color); cursor: not-allowed; @@ -298,9 +289,7 @@ input[disabled] { .annotationLayer .textWidgetAnnotation :is(input, textarea):hover, .annotationLayer .choiceWidgetAnnotation select:hover, -.annotationLayer -.buttonWidgetAnnotation:is(.checkBox, .radioButton) -input:hover { +.annotationLayer .buttonWidgetAnnotation:is(.checkBox, .radioButton) input:hover { border: 2px solid var(--input-hover-border-color); } @@ -489,7 +478,6 @@ input:hover { z-index: -1; } - :root { --xfa-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,"); --xfa-focus-outline: auto; @@ -827,10 +815,7 @@ input:hover { --freetext-padding: 2px; --resizer-bg-color: var(--outline-color); --resizer-size: 6px; - --resizer-shift: calc( - 0px - (var(--outline-width) + var(--resizer-size)) / 2 - - var(--outline-around-width) - ); + --resizer-shift: calc(0px - (var(--outline-width) + var(--resizer-size)) / 2 - var(--outline-around-width)); --editorFreeText-editing-cursor: text; --editorInk-editing-cursor: url(../images/cursor-editorInk.svg) 0 16, pointer; @@ -853,8 +838,7 @@ input:hover { @media (-webkit-min-device-pixel-ratio: 1.1), (min-resolution: 1.1dppx) { :root { - --editorFreeText-editing-cursor: url(../images/cursor-editorFreeText.svg) 0 16, - text; + --editorFreeText-editing-cursor: url(../images/cursor-editorFreeText.svg) 0 16, text; } } @@ -1109,216 +1093,354 @@ input:hover { } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomRight { + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomRight { cursor: nwse-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomMiddle { + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomMiddle { cursor: ns-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomLeft { + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomLeft { cursor: nesw-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleLeft { + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.middleLeft { cursor: ew-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topLeft, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topLeft, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomRight { + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomRight { cursor: nesw-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topMiddle, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topMiddle, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomMiddle, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomMiddle, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomMiddle { + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomMiddle { cursor: ew-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topRight, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.topRight, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.bottomLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomLeft { + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.bottomLeft { cursor: nwse-resize; } .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleRight, + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.middleRight, .annotationEditorLayer[data-main-rotation="0"] -:is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="90"], [data-editor-rotation="270"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="90"] -:is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="0"], [data-editor-rotation="180"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="180"] -:is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleLeft, + :is([data-editor-rotation="270"], [data-editor-rotation="90"]) + > .resizers + > .resizer.middleLeft, .annotationEditorLayer[data-main-rotation="270"] -:is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleLeft { + :is([data-editor-rotation="180"], [data-editor-rotation="0"]) + > .resizers + > .resizer.middleLeft { cursor: ns-resize; } .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="90"], - [data-main-rotation="90"] [data-editor-rotation="0"], - [data-main-rotation="180"] [data-editor-rotation="270"], - [data-main-rotation="270"] [data-editor-rotation="180"] - ) .altText { + :is( + [data-main-rotation="0"] [data-editor-rotation="90"], + [data-main-rotation="90"] [data-editor-rotation="0"], + [data-main-rotation="180"] [data-editor-rotation="270"], + [data-main-rotation="270"] [data-editor-rotation="180"] + ) + .altText { rotate: 270deg; } -[dir="ltr"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="90"], - [data-main-rotation="90"] [data-editor-rotation="0"], - [data-main-rotation="180"] [data-editor-rotation="270"], - [data-main-rotation="270"] [data-editor-rotation="180"] - ) .altText { +[dir="ltr"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="90"], + [data-main-rotation="90"] [data-editor-rotation="0"], + [data-main-rotation="180"] [data-editor-rotation="270"], + [data-main-rotation="270"] [data-editor-rotation="180"] + ) + .altText { inset-inline-start: calc(100% - 8px); } -[dir="ltr"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="90"], - [data-main-rotation="90"] [data-editor-rotation="0"], - [data-main-rotation="180"] [data-editor-rotation="270"], - [data-main-rotation="270"] [data-editor-rotation="180"] - ) .altText.small { +[dir="ltr"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="90"], + [data-main-rotation="90"] [data-editor-rotation="0"], + [data-main-rotation="180"] [data-editor-rotation="270"], + [data-main-rotation="270"] [data-editor-rotation="180"] + ) + .altText.small { inset-inline-start: calc(100% + 8px); inset-block-start: 100%; } -[dir="rtl"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="90"], - [data-main-rotation="90"] [data-editor-rotation="0"], - [data-main-rotation="180"] [data-editor-rotation="270"], - [data-main-rotation="270"] [data-editor-rotation="180"] - ) .altText { +[dir="rtl"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="90"], + [data-main-rotation="90"] [data-editor-rotation="0"], + [data-main-rotation="180"] [data-editor-rotation="270"], + [data-main-rotation="270"] [data-editor-rotation="180"] + ) + .altText { inset-block-end: calc(100% - 8px); } -[dir="rtl"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="90"], - [data-main-rotation="90"] [data-editor-rotation="0"], - [data-main-rotation="180"] [data-editor-rotation="270"], - [data-main-rotation="270"] [data-editor-rotation="180"] - ) .altText.small { +[dir="rtl"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="90"], + [data-main-rotation="90"] [data-editor-rotation="0"], + [data-main-rotation="180"] [data-editor-rotation="270"], + [data-main-rotation="270"] [data-editor-rotation="180"] + ) + .altText.small { inset-inline-start: -8px; inset-block-start: 0; } .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="180"], - [data-main-rotation="90"] [data-editor-rotation="90"], - [data-main-rotation="180"] [data-editor-rotation="0"], - [data-main-rotation="270"] [data-editor-rotation="270"] - ) .altText { + :is( + [data-main-rotation="0"] [data-editor-rotation="180"], + [data-main-rotation="90"] [data-editor-rotation="90"], + [data-main-rotation="180"] [data-editor-rotation="0"], + [data-main-rotation="270"] [data-editor-rotation="270"] + ) + .altText { rotate: 180deg; inset-block-end: calc(100% - 8px); @@ -1326,64 +1448,74 @@ input:hover { } .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="180"], - [data-main-rotation="90"] [data-editor-rotation="90"], - [data-main-rotation="180"] [data-editor-rotation="0"], - [data-main-rotation="270"] [data-editor-rotation="270"] - ) .altText.small { + :is( + [data-main-rotation="0"] [data-editor-rotation="180"], + [data-main-rotation="90"] [data-editor-rotation="90"], + [data-main-rotation="180"] [data-editor-rotation="0"], + [data-main-rotation="270"] [data-editor-rotation="270"] + ) + .altText.small { inset-inline-start: 100%; inset-block-start: -8px; } .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="270"], - [data-main-rotation="90"] [data-editor-rotation="180"], - [data-main-rotation="180"] [data-editor-rotation="90"], - [data-main-rotation="270"] [data-editor-rotation="0"] - ) .altText { + :is( + [data-main-rotation="0"] [data-editor-rotation="270"], + [data-main-rotation="90"] [data-editor-rotation="180"], + [data-main-rotation="180"] [data-editor-rotation="90"], + [data-main-rotation="270"] [data-editor-rotation="0"] + ) + .altText { rotate: 90deg; } -[dir="ltr"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="270"], - [data-main-rotation="90"] [data-editor-rotation="180"], - [data-main-rotation="180"] [data-editor-rotation="90"], - [data-main-rotation="270"] [data-editor-rotation="0"] - ) .altText { +[dir="ltr"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="270"], + [data-main-rotation="90"] [data-editor-rotation="180"], + [data-main-rotation="180"] [data-editor-rotation="90"], + [data-main-rotation="270"] [data-editor-rotation="0"] + ) + .altText { inset-block-end: calc(100% - 8px); } -[dir="ltr"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="270"], - [data-main-rotation="90"] [data-editor-rotation="180"], - [data-main-rotation="180"] [data-editor-rotation="90"], - [data-main-rotation="270"] [data-editor-rotation="0"] - ) .altText.small { +[dir="ltr"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="270"], + [data-main-rotation="90"] [data-editor-rotation="180"], + [data-main-rotation="180"] [data-editor-rotation="90"], + [data-main-rotation="270"] [data-editor-rotation="0"] + ) + .altText.small { inset-inline-start: -8px; inset-block-start: 0; } -[dir="rtl"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="270"], - [data-main-rotation="90"] [data-editor-rotation="180"], - [data-main-rotation="180"] [data-editor-rotation="90"], - [data-main-rotation="270"] [data-editor-rotation="0"] - ) .altText { +[dir="rtl"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="270"], + [data-main-rotation="90"] [data-editor-rotation="180"], + [data-main-rotation="180"] [data-editor-rotation="90"], + [data-main-rotation="270"] [data-editor-rotation="0"] + ) + .altText { inset-inline-start: calc(100% - 8px); } -[dir="rtl"] .annotationEditorLayer -:is( - [data-main-rotation="0"] [data-editor-rotation="270"], - [data-main-rotation="90"] [data-editor-rotation="180"], - [data-main-rotation="180"] [data-editor-rotation="90"], - [data-main-rotation="270"] [data-editor-rotation="0"] - ) .altText.small { +[dir="rtl"] + .annotationEditorLayer + :is( + [data-main-rotation="0"] [data-editor-rotation="270"], + [data-main-rotation="90"] [data-editor-rotation="180"], + [data-main-rotation="180"] [data-editor-rotation="90"], + [data-main-rotation="270"] [data-editor-rotation="0"] + ) + .altText.small { inset-inline-start: calc(100% + 8px); inset-block-start: 100%; } @@ -1421,7 +1553,6 @@ input:hover { } .altText.small { - inset-block-end: unset; inset-inline-start: 0; inset-block-start: calc(100% + 8px); @@ -1515,7 +1646,6 @@ input:hover { } @media (prefers-color-scheme: dark) { - .altText .tooltip.show { --alt-text-tooltip-bg: #1c1b22; --alt-text-tooltip-fg: #fbfbfe; @@ -1524,7 +1654,6 @@ input:hover { } @media screen and (forced-colors: active) { - .altText .tooltip.show { --alt-text-tooltip-bg: Canvas; --alt-text-tooltip-fg: CanvasText; @@ -1581,7 +1710,6 @@ input:hover { } @media (prefers-color-scheme: dark) { - #altTextDialog { --dialog-bg-color: #1c1b22; --dialog-border-color: #1c1b22; @@ -1604,7 +1732,6 @@ input:hover { } @media screen and (forced-colors: active) { - #altTextDialog { --dialog-bg-color: Canvas; --dialog-border-color: CanvasText; @@ -2022,8 +2149,8 @@ input:hover { --toolbar-border-color: rgba(184, 184, 184, 1); --toolbar-box-shadow: 0 1px 0 var(--toolbar-border-color); --toolbar-border-bottom: none; - --toolbarSidebar-box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25), - 0 1px 0 rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.1); + --toolbarSidebar-box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(0, 0, 0, 0.15), + 0 0 1px rgba(0, 0, 0, 0.1); --toolbarSidebar-border-bottom: none; --button-hover-color: rgba(221, 222, 223, 1); --toggled-btn-color: rgba(0, 0, 0, 1); @@ -2319,8 +2446,7 @@ body { font: message-box; } -:is(.toolbar, .editorParamsToolbar, .findbar, #sidebarContainer) -:is(input, button, select), +:is(.toolbar, .editorParamsToolbar, .findbar, #sidebarContainer) :is(input, button, select), .secondaryToolbar :is(input, button, a, select) { outline: none; font: message-box; @@ -2417,19 +2543,18 @@ body { height: 100%; width: calc(100% + 150px); background: repeating-linear-gradient( - 135deg, - var(--progressBar-blend-color) 0, - var(--progressBar-bg-color) 5px, - var(--progressBar-bg-color) 45px, - var(--progressBar-color) 55px, - var(--progressBar-color) 95px, - var(--progressBar-blend-color) 100px + 135deg, + var(--progressBar-blend-color) 0, + var(--progressBar-bg-color) 5px, + var(--progressBar-bg-color) 45px, + var(--progressBar-color) 55px, + var(--progressBar-color) 95px, + var(--progressBar-blend-color) 100px ); animation: progressIndeterminate 1s linear infinite; } -#outerContainer.sidebarResizing -:is(#sidebarContainer, #viewerContainer, #loadingBar) { +#outerContainer.sidebarResizing :is(#sidebarContainer, #viewerContainer, #loadingBar) { /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */ transition-duration: 0s; } @@ -2600,8 +2725,9 @@ body { .doorHanger, .doorHangerRight { border-radius: 2px; - box-shadow: 0 1px 5px var(--doorhanger-border-color), - 0 0 0 1px var(--doorhanger-border-color); + box-shadow: + 0 1px 5px var(--doorhanger-border-color), + 0 0 0 1px var(--doorhanger-border-color); border: var(--doorhanger-border-color-whcm); } @@ -3455,8 +3581,7 @@ dialog :link { cursor: grab !important; } -.grab-to-pan-grab -*:not(input):not(textarea):not(button):not(select):not(:link) { +.grab-to-pan-grab *:not(input):not(textarea):not(button):not(select):not(:link) { cursor: inherit !important; } diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html index 1ce5726f..17e79d57 100644 --- a/src/main/resources/templates/about.html +++ b/src/main/resources/templates/about.html @@ -1,22 +1,21 @@ - - - - - -
-
-
-

-
-
-
+ + + + + +
+
+ +

+
+
+
+
+
-
-
- - - + + \ No newline at end of file diff --git a/src/main/resources/templates/account.html b/src/main/resources/templates/account.html index b39da2f1..9b7f4df9 100644 --- a/src/main/resources/templates/account.html +++ b/src/main/resources/templates/account.html @@ -1,326 +1,286 @@ - - + + + + + - - - +
-
-
-

-
-
-
+
+ +

+
+
+
- -

User Settings

-
-
- Default message if not found -
-
- Default message if not found -
-
- Default message if not found -
-
- Default message if not found -
- - - - - - - -

User!

- - - -

-
-
- - -
-
- - -
-
- -
-
- -
- - -

Change Password?

-
-
- - -
-
- - -
-
- - -
-
- -
-
- -
- -
-
- -
-
-
- -
- - - - - -
-
-
-
- - - - -
- -

Sync browser settings with Account

-
-

Settings Comparison:

- - - - - - - - - - - -
PropertyAccount SettingWeb Browser Setting
- -
- - -
-
- - - - - - - - - - - - - - - -
- - - - - - - -
- -
+ +

User Settings

+
+ +
+ Default message if not found +
+
+ Default message if not found +
+
+ Default message if not found +
+
+ Default message if not found +
+ + +

User!

+ + + + +

+
+
+ +
-
+
+ + +
+
+ +
+ +
+ + +

Change Password?

+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+ +
+
+
+
+ +
+ + + +
+
+
+
+ + + +
+ +

Sync browser settings with Account

+
+

Settings Comparison:

+ + + + + + + + + + + +
PropertyAccount SettingWeb Browser Setting
+ +
+ + +
+
+ + +
+ + + + + + +
+
+
-
+
+
- + diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html index ff3eb559..0cf3306d 100644 --- a/src/main/resources/templates/addUsers.html +++ b/src/main/resources/templates/addUsers.html @@ -1,84 +1,78 @@ - + + + + - - - +
-
-
-

-
-
-
+
+ +

+
+
+
- -

Admin User Control Settings

+ +

Admin User Control Settings

+ + + + + + + + + + + + + + + +
UsernameRolesActions
+
+ +
+
- - - - - - - - - - - - - - - - - - -
UsernameRolesActions
-
- -
-
- - - -

Add New User

-
- Default message if not found -
-
-
- - -
-
- - -
-
- - -
-
- - -
- - - -
-
+

Add New User

+
+ Default message if not found +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
-
+ + + +
+
-
+
+
- + diff --git a/src/main/resources/templates/auto-split-pdf.html b/src/main/resources/templates/auto-split-pdf.html index 304216b9..e4d213d8 100644 --- a/src/main/resources/templates/auto-split-pdf.html +++ b/src/main/resources/templates/auto-split-pdf.html @@ -1,44 +1,43 @@ - + + + + - - - - +
-
-
-

-
-
-
-

- -

-
    -
  • -
  • -
  • -
  • -
-
-

-
-
- - -
-

-

- -
-
+
+ +

+
+
+
+

+ +

+
    +
  • +
  • +
  • +
  • +
+
+

+
+
+ +
+

+

+ +
- +
-
+
+
- + \ No newline at end of file diff --git a/src/main/resources/templates/change-creds.html b/src/main/resources/templates/change-creds.html index f5b86b67..4709e40b 100644 --- a/src/main/resources/templates/change-creds.html +++ b/src/main/resources/templates/change-creds.html @@ -1,90 +1,83 @@ - - + + + + + - - - +
-
-
-

-
-
-
- - -

User Settings

-
- -
- Default message if not found -
-
- Default message if not found -
-
- Default message if not found -
-
- Default message if not found -
- - -

User!

- - - -

-

Change Username and password

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
- - - +
+ +

+
+
+
+ +

User Settings

+
+ +
+ Default message if not found +
+
+ Default message if not found +
+
+ Default message if not found +
+
+ Default message if not found +
+ + +

User!

+ +

+

Change Username and password

+
+
+ +
-
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + +
+
-
+
+
- + diff --git a/src/main/resources/templates/convert/book-to-pdf.html b/src/main/resources/templates/convert/book-to-pdf.html index 67facbb3..94229ccf 100644 --- a/src/main/resources/templates/convert/book-to-pdf.html +++ b/src/main/resources/templates/convert/book-to-pdf.html @@ -1,29 +1,31 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
-
- -
-

-

-
-
+
+ +

+
+
+
+

+
+
+
+ +
+

+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/file-to-pdf.html b/src/main/resources/templates/convert/file-to-pdf.html index 774c2dc8..3949688f 100644 --- a/src/main/resources/templates/convert/file-to-pdf.html +++ b/src/main/resources/templates/convert/file-to-pdf.html @@ -1,37 +1,34 @@ - + + + + - - - - +
-
-
-

-
-
-
-

-

-

-
-
- - -
-

-

-

- https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html - -
-
+
+ +

+
+
+
+

+

+
+
+
+ +
+

+

+

+ https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html
- +
-
+
+
- + \ No newline at end of file diff --git a/src/main/resources/templates/convert/html-to-pdf.html b/src/main/resources/templates/convert/html-to-pdf.html index f0d17e6e..11184606 100644 --- a/src/main/resources/templates/convert/html-to-pdf.html +++ b/src/main/resources/templates/convert/html-to-pdf.html @@ -1,36 +1,35 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
- -
- - -
- -
- - -
-

-

-
+
+ +

+
+
+
+

+
+
+
+ +
+
+ +
+

+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html index 60478409..4de9e0f6 100644 --- a/src/main/resources/templates/convert/img-to-pdf.html +++ b/src/main/resources/templates/convert/img-to-pdf.html @@ -1,88 +1,82 @@ - + + + + - - - +
-
-
-

-
-
-
-

- -
- -
- -
- - -
- -
- - -
-
- - -
-
- -
- - -
- -

- - - -
-
+
+ +

+
+
+
+

+
+
+
+ +
-
+
+ + +
+
+ + +
+
+ +
+ + +
+

+ + + +
+
-
+
+
- + diff --git a/src/main/resources/templates/convert/markdown-to-pdf.html b/src/main/resources/templates/convert/markdown-to-pdf.html index 4606d2b5..d0266aac 100644 --- a/src/main/resources/templates/convert/markdown-to-pdf.html +++ b/src/main/resources/templates/convert/markdown-to-pdf.html @@ -1,30 +1,31 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
-
- - -
-

-

-
-
+
+ +

+
+
+
+

+
+
+
+ +
+

+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/pdf-to-book.html b/src/main/resources/templates/convert/pdf-to-book.html index a136c5cf..e8ef9402 100644 --- a/src/main/resources/templates/convert/pdf-to-book.html +++ b/src/main/resources/templates/convert/pdf-to-book.html @@ -1,55 +1,47 @@ - + + + + - - - - -
-
-
-

-
-
-
-

-
-
- -
- - -
-
- - -
-

-

-
-
-
-
-
-
- + + +
+
+ +

+
+
+
+

+
+
+
+ + +
+
+ +
+

+

+
+
+
+
+ +
+ diff --git a/src/main/resources/templates/convert/pdf-to-csv.html b/src/main/resources/templates/convert/pdf-to-csv.html index 463e1a9c..d21156f0 100644 --- a/src/main/resources/templates/convert/pdf-to-csv.html +++ b/src/main/resources/templates/convert/pdf-to-csv.html @@ -1,159 +1,143 @@ - + + + + - - - - -
-
-
-

+ +
+
+ +

-
-
-

-
- -
- -
- - -
-
- - - - -
- -
- - +
+
+

+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
-
-
- + diff --git a/src/main/resources/templates/convert/pdf-to-html.html b/src/main/resources/templates/convert/pdf-to-html.html index 7360e631..b2347f02 100644 --- a/src/main/resources/templates/convert/pdf-to-html.html +++ b/src/main/resources/templates/convert/pdf-to-html.html @@ -1,29 +1,30 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
-
- - -
-

-
-
+
+ +

+
+
+
+

+
+
+
+ +
+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html index 52bf2e66..61034578 100644 --- a/src/main/resources/templates/convert/pdf-to-img.html +++ b/src/main/resources/templates/convert/pdf-to-img.html @@ -1,61 +1,58 @@ - + + + + - - - - +
-
-
- -

-
-
-
-

-

-
-
-
- - -
-
- - -
-
- - -
-
- - -
- -
- -
+
+ +

+
+
+
+

+

+
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
- +
-
+
+
- + diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index 5b0d5cf1..1b75a078 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -1,32 +1,31 @@ - + + + + - - - - +
-
-
-

-
-
-
-

-

Currently doesn't work for multiple inputs at once

-
-
-
- -
-

-
-
+
+ +

+
+
+
+

+

Currently doesn't work for multiple inputs at once

+
+
+
+ +
+

- +
-
+
+
- + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-presentation.html b/src/main/resources/templates/convert/pdf-to-presentation.html index a08c202b..f0a4a44a 100644 --- a/src/main/resources/templates/convert/pdf-to-presentation.html +++ b/src/main/resources/templates/convert/pdf-to-presentation.html @@ -1,38 +1,38 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
- -
- - -
-
- - -
-

-
+
+ +

+
+
+
+

+
+
+
+ +
+
+ +
+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/pdf-to-text.html b/src/main/resources/templates/convert/pdf-to-text.html index 8ad6e94a..cc6b7dcb 100644 --- a/src/main/resources/templates/convert/pdf-to-text.html +++ b/src/main/resources/templates/convert/pdf-to-text.html @@ -1,35 +1,38 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
- -
- - -
-
- - -
-

-
+
+ +

+
+
+
+

+
+
+
+ +
+
+ +
+

+
+
+
+
-
-
+ + + diff --git a/src/main/resources/templates/convert/pdf-to-word.html b/src/main/resources/templates/convert/pdf-to-word.html index 8ed0d9a8..74e6f314 100644 --- a/src/main/resources/templates/convert/pdf-to-word.html +++ b/src/main/resources/templates/convert/pdf-to-word.html @@ -1,40 +1,40 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
- -
- - -
-
- - -
-

-
+
+ +

+
+
+
+

+
+
+
+ +
+
+ +
+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/pdf-to-xml.html b/src/main/resources/templates/convert/pdf-to-xml.html index b26a97fe..701220c1 100644 --- a/src/main/resources/templates/convert/pdf-to-xml.html +++ b/src/main/resources/templates/convert/pdf-to-xml.html @@ -1,29 +1,30 @@ - + + + + - - +
-
-
-

-
-
-
-

-
-
-
- - -
-

-
-
+
+ +

+
+
+
+

+
+
+
+ +
+

+
-
+
+
- + diff --git a/src/main/resources/templates/convert/url-to-pdf.html b/src/main/resources/templates/convert/url-to-pdf.html index c74bd5d5..68044385 100644 --- a/src/main/resources/templates/convert/url-to-pdf.html +++ b/src/main/resources/templates/convert/url-to-pdf.html @@ -1,29 +1,30 @@ - + + + + - - +
-
-
-

-
-
-
-

-
- -
- - -
-

-
-
+
+ +

+
+
+
+

+
+ +
+ +
+

+
-
+
+
- + diff --git a/src/main/resources/templates/crop.html b/src/main/resources/templates/crop.html index f0d2186f..825cfbec 100644 --- a/src/main/resources/templates/crop.html +++ b/src/main/resources/templates/crop.html @@ -1,147 +1,135 @@ - + + + + - - - - -
-
-
-

-
-
-
-

-
-
- - - - - -
-
- - -
- - - -
+ +
+
+ +

+
+
+
+

+
+
+ + + + + +
+
+ +
+
+
-
-
- + diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 90e654f7..d3cbecb6 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -1,131 +1,39 @@ - - + - Error! :( - - + -
-
- -
-
-
- -
-

Oops!

-

We can't seem to find the page you're looking for.

-

Something went wrong

- -
-

Need help / Found a issue?

-

If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:

-
- Submit a ticket on GitHub - Join our Discord server +
+
+ +
+
+
+

Oops!

+

+ We can't seem to find the page you're looking for. +

+

+ Something went wrong +

+
+

Need help / Found a issue?

+

+ If you're still having trouble, don't hesitate to reach out to us + for help. You can submit a ticket on our GitHub page or contact us + through Discord: +

+ + Go back to homepage
- Go back to homepage
+
-
-
- - - diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html index 77cc7496..a14e13d2 100644 --- a/src/main/resources/templates/extract-page.html +++ b/src/main/resources/templates/extract-page.html @@ -1,33 +1,33 @@ - + + + + - - - - +
-
-
-

-
-
-
-

-
-
- -
- - -
- - -
-
+
+ +

+
+
+
+

+
+
+ +
+ +
+ + +
+
-
+
+
- + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/card.html b/src/main/resources/templates/fragments/card.html index 1d8193cd..6fa05163 100644 --- a/src/main/resources/templates/fragments/card.html +++ b/src/main/resources/templates/fragments/card.html @@ -1,12 +1,12 @@ -
- -
- Icon -
-
-

- -
- Favorite -
-
+
+ +
+ Icon +
+
+

+ +
+ Favorite +
+
diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index 633810ef..78f229c6 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -1,137 +1,144 @@ - + + + - - + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + - - - + + + + - - - - + + - - + + - - + + - - + + + + + + + - - - - - - - + + + + + + + + + - + + + + + + - -
-
Lives: 3
-
Score: 0
-
High Score: 0
-
Level: 1
- -
- + +
+
Lives: 3
+
Score: 0
+
High Score: 0
+
Level: 1
+ +
+ - - - + + + -
-
- -
-
-
+
+
+ +
+
+
- - - - - - - + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/errorBanner.html b/src/main/resources/templates/fragments/errorBanner.html index 1bc79031..d9865b63 100644 --- a/src/main/resources/templates/fragments/errorBanner.html +++ b/src/main/resources/templates/fragments/errorBanner.html @@ -1,23 +1,5 @@ -
+ diff --git a/src/main/resources/templates/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html index d97d88d9..3638391e 100644 --- a/src/main/resources/templates/merge-pdfs.html +++ b/src/main/resources/templates/merge-pdfs.html @@ -1,40 +1,39 @@ - + + + + + - - - - +
-
-
-

-
-
-
-

-
-
- -
- -
-
-
    -
    -
    - - - -
    -
    - - -
    +
    + +

    +
    +
    +
    +

    +
    +
    + +
    +
    +
      +
      +
      + + + +
      +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index ae531a8f..1a0f96ee 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -1,141 +1,112 @@ - - - + + + + - - +
      -
      -
      -

      -
      -
      -
      -

      +
      + +

      +
      +
      +
      +

      - -
      - + document.querySelectorAll(".show-on-file-selected").forEach(el => { + el.style.cssText = ''; + }); + } + }); + document.addEventListener("DOMContentLoaded", () => { + document.querySelectorAll(".show-on-file-selected").forEach(el => { + el.style.cssText = "display:none !important"; + }) + }); + -
      -
      -
      - -
      -
      - - -
      - - -
      - - - -
      - -
      - - -
      - -
      - -
      +
      +
      +
      +
      +
      + + +
      + + +
      + + + +
      +
      + + +
      + +
      + +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/misc/add-page-numbers.html b/src/main/resources/templates/misc/add-page-numbers.html index e484a72d..bd7104c2 100644 --- a/src/main/resources/templates/misc/add-page-numbers.html +++ b/src/main/resources/templates/misc/add-page-numbers.html @@ -1,154 +1,137 @@ - + + + + + -#myForm { - display: flex; - justify-content: center; - align-items: center; - margin-top: 20px; -} + + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      +
      + + +
      +
      + +
      +
      1
      +
      2
      +
      3
      +
      4
      +
      5
      +
      6
      +
      7
      +
      8
      +
      9
      +
      +
      + +
      + + +
      +
      + + +
      +
      + + +
      + +
      +
      +
      +
      + - -
      -
      -
      - + cell.addEventListener('mouseleave', function(e) { + if(e.target.classList.contains('selectedPosition')) { + e.target.classList.remove('selectedHovered'); + } + }); + }); + +
      + +
      + diff --git a/src/main/resources/templates/misc/adjust-contrast.html b/src/main/resources/templates/misc/adjust-contrast.html index 23effdd0..2b28a734 100644 --- a/src/main/resources/templates/misc/adjust-contrast.html +++ b/src/main/resources/templates/misc/adjust-contrast.html @@ -1,20 +1,17 @@ - - - - + + + + -
      -
      -
      -

      -
      -
      -
      +
      +
      + +

      +
      +
      +
      - - + -
      -
      -
      -
      -
      -
      + document.getElementById('download-button').addEventListener('click', function() { + downloadPDF(); + }); + +
      +
      +
      +
      + +
      diff --git a/src/main/resources/templates/misc/auto-crop.html b/src/main/resources/templates/misc/auto-crop.html index da6e6c22..d3f79ade 100644 --- a/src/main/resources/templates/misc/auto-crop.html +++ b/src/main/resources/templates/misc/auto-crop.html @@ -1,31 +1,30 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - -
      -

      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +

      - +
      -
      +
      +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/auto-rename.html b/src/main/resources/templates/misc/auto-rename.html index 0295acac..62712dce 100644 --- a/src/main/resources/templates/misc/auto-rename.html +++ b/src/main/resources/templates/misc/auto-rename.html @@ -1,30 +1,29 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      - +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/misc/change-metadata.html b/src/main/resources/templates/misc/change-metadata.html index 6affa6bf..e2c8de1c 100644 --- a/src/main/resources/templates/misc/change-metadata.html +++ b/src/main/resources/templates/misc/change-metadata.html @@ -1,261 +1,227 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -

      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - -
      -
      - - -
      - -
      +
      + +

      +
      +
      +
      +

      +
      +
      +

      +
      + +
      +
      + + +
      +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + +
      +
      + + +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/misc/compare.html b/src/main/resources/templates/misc/compare.html index ffe08a31..c9194005 100644 --- a/src/main/resources/templates/misc/compare.html +++ b/src/main/resources/templates/misc/compare.html @@ -1,190 +1,187 @@ - + + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      - - - -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - - -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      +
      +

      +
      +
      +

      +
      +
      +
      +
      +
      -
      +
      +
      + + diff --git a/src/main/resources/templates/misc/compress-pdf.html b/src/main/resources/templates/misc/compress-pdf.html index c991a6c8..ef495577 100644 --- a/src/main/resources/templates/misc/compress-pdf.html +++ b/src/main/resources/templates/misc/compress-pdf.html @@ -1,50 +1,48 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      -
      -

      - - -
      -
      - -
      -
      -

      - - -
      -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      +
      +

      + + +
      +
      +
      +

      + + +
      +
      + +
      +
      -
      +
      +
      - - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/extract-image-scans.html b/src/main/resources/templates/misc/extract-image-scans.html index 82f7313c..016cc973 100644 --- a/src/main/resources/templates/misc/extract-image-scans.html +++ b/src/main/resources/templates/misc/extract-image-scans.html @@ -1,54 +1,53 @@ - + + + + - - - - -
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -
      - - - -
      -
      - - - -
      -
      - - - -
      -
      - - - -
      -
      - - - -
      - -
      + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      + +
      +
      +
      -
      -
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/extract-images.html b/src/main/resources/templates/misc/extract-images.html index e813e680..caf4b549 100644 --- a/src/main/resources/templates/misc/extract-images.html +++ b/src/main/resources/templates/misc/extract-images.html @@ -1,36 +1,35 @@ - + + + + - - - - -
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -
      - - - + +
      + +
      - -
      +
      -
      -
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/flatten.html b/src/main/resources/templates/misc/flatten.html index 430e343b..94c616cc 100644 --- a/src/main/resources/templates/misc/flatten.html +++ b/src/main/resources/templates/misc/flatten.html @@ -1,57 +1,55 @@ - + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      -
      - - - - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + + + +
      +
      -
      +
      +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/ocr-pdf.html b/src/main/resources/templates/misc/ocr-pdf.html index 9aabdec4..4d9b0046 100644 --- a/src/main/resources/templates/misc/ocr-pdf.html +++ b/src/main/resources/templates/misc/ocr-pdf.html @@ -1,254 +1,249 @@ - - - - - + + + - + - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - -
      -
      -
      - - -
      -
      -
      -
      -
      - - -
      -
      - -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      - - -
      - - -
      -
      - -
      - -

      -

      - https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      + + +
      +
      + +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + +
      + +

      +

      + https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR.md
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/misc/remove-annotations.html b/src/main/resources/templates/misc/remove-annotations.html index cbd46be4..40623fac 100644 --- a/src/main/resources/templates/misc/remove-annotations.html +++ b/src/main/resources/templates/misc/remove-annotations.html @@ -1,64 +1,65 @@ - - + + + + - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      -
      +
      +
      - - - + + \ No newline at end of file diff --git a/src/main/resources/templates/misc/remove-blanks.html b/src/main/resources/templates/misc/remove-blanks.html index b2c8e358..99ce01db 100644 --- a/src/main/resources/templates/misc/remove-blanks.html +++ b/src/main/resources/templates/misc/remove-blanks.html @@ -1,39 +1,38 @@ - + + + + - - - - -
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -
      - - - -
      -
      - - - -
      - -
      + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + + + +
      +
      + + + +
      + +
      +
      +
      -
      -
      - + diff --git a/src/main/resources/templates/misc/repair.html b/src/main/resources/templates/misc/repair.html index 10d5d148..2b7e4d5a 100644 --- a/src/main/resources/templates/misc/repair.html +++ b/src/main/resources/templates/misc/repair.html @@ -1,29 +1,27 @@ - + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      +
      -
      +
      +
      - - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/show-javascript.html b/src/main/resources/templates/misc/show-javascript.html index 0614a2c2..0311fe0e 100644 --- a/src/main/resources/templates/misc/show-javascript.html +++ b/src/main/resources/templates/misc/show-javascript.html @@ -1,100 +1,93 @@ - - - - - -
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - + + + + + + + -
      -
      - -
      - -
      + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      + +
      + +
      - - -
      - - -
      -
      -
      - -
      -
      -
      - + // Set the URL as the href of the download button and provide a download name + let downloadButton = document.querySelector('#downloadJS'); + downloadButton.href = url; + downloadButton.download = 'extracted.js'; + downloadButton.style.display = 'block'; + }) + .catch(error => { + console.error('Error:', error); + }); + }); + +
      +
      +
      +
      + +
      + \ No newline at end of file diff --git a/src/main/resources/templates/misc/stamp.html b/src/main/resources/templates/misc/stamp.html index 1578de36..5fa2125a 100644 --- a/src/main/resources/templates/misc/stamp.html +++ b/src/main/resources/templates/misc/stamp.html @@ -1,222 +1,167 @@ - + + + + - + + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      +
      + + +
      + +
      + + +
      + +
      + +
      +
      1
      +
      2
      +
      3
      +
      4
      +
      5
      +
      6
      +
      7
      +
      8
      +
      9
      +
      +
      + + + +
      + + +
      + +
      + + +
      + + + +
      + + +
      + +
      + + +
      + +
      + + +
      + +
      + + +
      - - -
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      +
      + + +
      -
      - - -
      +
      + + +
      -
      - - -
      - - - -
      - -
      -
      1
      -
      2
      -
      3
      -
      4
      -
      5
      -
      6
      -
      7
      -
      8
      -
      9
      -
      -
      - - - - - -
      - - + + +
      +
      + -
      -
      -
      - + if (stampType === 'text') { + stampTextGroup.style.display = 'block'; + stampImageGroup.style.display = 'none'; + alphabetGroup.style.display = 'block'; + } else if (stampType === 'image') { + stampTextGroup.style.display = 'none'; + stampImageGroup.style.display = 'block'; + alphabetGroup.style.display = 'none'; + } + } + +
      + +
      + diff --git a/src/main/resources/templates/multi-page-layout.html b/src/main/resources/templates/multi-page-layout.html index 646f7dc0..5f77806b 100644 --- a/src/main/resources/templates/multi-page-layout.html +++ b/src/main/resources/templates/multi-page-layout.html @@ -1,43 +1,41 @@ - + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - - -
      -
      - - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      + + +
      + +
      +
      -
      +
      +
      - - + \ No newline at end of file diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html index d49b7f83..ef618e0c 100644 --- a/src/main/resources/templates/multi-tool.html +++ b/src/main/resources/templates/multi-tool.html @@ -1,233 +1,104 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -

      -
      -
      -
      -
      - -
      - PDF Page -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      - - -
      -
      -
      - - - - - - - - - - -
      -
      +
      + +

      +
      +
      +

      +
      +
      +
      +
      + +
      + PDF Page
      +
      +
      -
      +
      +
      +
      +
      +
      + + +
      +
      +
      + + + + +
      +
      +
      +
      +
      +
      - - - - + diff --git a/src/main/resources/templates/overlay-pdf.html b/src/main/resources/templates/overlay-pdf.html index cab73486..7e17c913 100644 --- a/src/main/resources/templates/overlay-pdf.html +++ b/src/main/resources/templates/overlay-pdf.html @@ -1,102 +1,96 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      - -

      - -
      -
      - - - -
      - - -
      - - - -
      - - - - - -
      + + +
      + + +
      + -
      + + + +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html index 4c033e35..5f2ff037 100644 --- a/src/main/resources/templates/pdf-organizer.html +++ b/src/main/resources/templates/pdf-organizer.html @@ -1,57 +1,56 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      +
      + +

      +
      +
      +
      +

      -
      -
      -
      - - -
      -
      - - -
      - - -
      - -
      +
      +
      +
      + +
      +
      + + +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/pdf-to-single-page.html b/src/main/resources/templates/pdf-to-single-page.html index 6c26ace5..c3c56e4c 100644 --- a/src/main/resources/templates/pdf-to-single-page.html +++ b/src/main/resources/templates/pdf-to-single-page.html @@ -1,28 +1,27 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      - +
      -
      +
      +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html index d70c52ff..0489f1a4 100644 --- a/src/main/resources/templates/pipeline.html +++ b/src/main/resources/templates/pipeline.html @@ -1,254 +1,163 @@ - - - - - - + - -
      -
      -
      + +
      +
      + +

      +
      +
      +

      +

      +
      +
      + + +
      -

      -
      -
      +
      +
      + +
      +
      +
      +
      +
      + +
      +
      +
      -

      -

      -
      -
      - - +

      Below info is Alpha only, will be removed and hence not translated

      -
      +

      Current Limitations

      -
      -
      - -
      -
      -
      -
      -
      - +

      User Guide for Local Directory Scanning and File Processing

      -
      -
      -
      +

      Setting Up Watched Folders:

      +

      Create a folder where you want your files to be monitored. This is your 'watched folder'.

      +

      The default directory for this is ./pipeline/watchedFolders/

      +

      Place any directories you want to be scanned into this folder, this folder should contain multiple folders each for their own tasks and pipelines.

      +

      Configuring Processing with JSON Files:

      +

      In each directory you want processed (e.g. ./pipeline/watchedFolders/officePrinter), include a JSON configuration file.

      +

      This JSON file should specify how you want the files in the directory to be handled (e.g., what operations to perform on them) which can be made, configured and downloaded from Stirling-PDF Pipeline interface.

      -

      Below info is Alpha only, will be removed and hence not translated

      -

      Current Limitations

      -
        -
      • Cannot have more than one of the same operation
        • -
      • Cannot input additional files via UI
        • -
      • All files and operations run in serial mode
        • -
      +

      Automatic Scanning and Processing:

      +

      The system automatically checks the watched folder every minute for new directories and files to process.

      +

      When a directory with a valid JSON configuration file is found, it begins processing the files inside as per the configuration.

      -

      How it Works Notes

      -
        -
      • Configure the pipeline config file and input files to run - files against it
        • -
      • For reuse, download the config file and re-upload it when - needed, or place it in /pipeline/defaultWebUIConfigs/ to - auto-load in the web UI for all users
        • -
      +

      Processing Steps:

      +

      Files in each directory are processed according to the instructions in the JSON file.

      +

      This might involve file conversions, data filtering, renaming files, etc. If the output of a step is a zip, this zip will be automatically unzipped as it passes to next process.

      -

      How to use pre-load configs in web UI

      -
        -
      • Download config files
        • -
      • For reuse, download the config file and re-upload it when - needed, or place it in /pipeline/defaultWebUIConfigs/ to - auto-load in the web UI for all users
        • -
      +

      Results and Output:

      +

      After processing, the results are saved in a specified output location. This could be a different folder or location as defined in the JSON file or the default location ./pipeline/finishedFolders/.

      +

      Each processed file is named and organized according to the rules set in the JSON configuration.

      -

      Todo

      -
        -
      • Save to browser/Account
        • -
      • offline folder scan mode checks and testing for unique usecases
        • -
      • Improve operation config settings UI
        • -
      +

      Completion and Cleanup:

      +

      Once processing is complete, the original files in the watched folder's directory are removed.

      +

      You can find the processed files in the designated output location.

      +

      Error Handling:

      +

      If there's an error during processing, the system will not delete the original files, allowing you to check and retry if necessary.

      -

      User Guide for Local Directory Scanning and File - Processing

      +

      User Interaction:

      +

      As a user, your main tasks are to set up the watched folders, place directories with files for processing, and create the corresponding JSON configuration files.

      +

      The system handles the rest, including scanning, processing, and outputting results.

      -

      Setting Up Watched Folders:

      -

      Create a folder where you want your files to be monitored. - This is your 'watched folder'.

      -

      - The default directory for this is - ./pipeline/watchedFolders/ -

      -

      Place any directories you want to be scanned into this - folder, this folder should contain multiple folders each for their - own tasks and pipelines.

      + + - - +
      + +
      +
      +
      +
      +
      + +
      +
      +
      + +
      + diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html index 1449fc2e..e540e7dc 100644 --- a/src/main/resources/templates/remove-pages.html +++ b/src/main/resources/templates/remove-pages.html @@ -1,38 +1,37 @@ - + + + + - + +
      +
      + +

      +
      +
      +
      +

      - - - -
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -
      - - -
      - -
      +
      +
      +
      + + +
      + +
      +
      +
      -
      -
      - - + + \ No newline at end of file diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html index 72cb280d..920ed4ab 100644 --- a/src/main/resources/templates/rotate-pdf.html +++ b/src/main/resources/templates/rotate-pdf.html @@ -1,132 +1,98 @@ - + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      +
      + +

      +
      +
      +
      +

      -
      -
      - + +
      + - -
      + +
      +
      -
      +
      +
      - - + preview.style.rotate = newAngle + "deg"; + angleInput.value = newAngle; + } + diff --git a/src/main/resources/templates/scale-pages.html b/src/main/resources/templates/scale-pages.html index 1165f862..22b52ba6 100644 --- a/src/main/resources/templates/scale-pages.html +++ b/src/main/resources/templates/scale-pages.html @@ -1,47 +1,45 @@ - + + + + - - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - - -
      -
      - - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      + + +
      + +
      +
      -
      +
      +
      - - + \ No newline at end of file diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html index 5c09720f..b495bcb2 100644 --- a/src/main/resources/templates/security/add-password.html +++ b/src/main/resources/templates/security/add-password.html @@ -1,86 +1,85 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      - -
      -
      -
      - - -
      -
      - - -
      - -
      - -
      -
      - -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      - -
      -
      -
      - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      +
      + + +
      +
      + + +
      + +
      + + +
      +
      + +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      +
      +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html index f61dcabf..297c9ba1 100644 --- a/src/main/resources/templates/security/add-watermark.html +++ b/src/main/resources/templates/security/add-watermark.html @@ -1,144 +1,142 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      - -
      - -
      -
      - -
      - - -
      -
      - - -
      -
      - - -
      - - - -
      - - -
      -
      - - - -
      - - - - -
      - - -
      -
      - - -
      -
      - - -
      -
      - -
      -
      - - +
      + +

      +
      +
      +
      +

      +
      +
      + +
      + +
      -
      + +
      + + +
      +
      + + +
      +
      + + +
      + + + +
      + + +
      +
      + + + +
      + + +
      + + +
      +
      + + +
      +
      + + +
      +
      + +
      + + +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/security/auto-redact.html b/src/main/resources/templates/security/auto-redact.html index 791b5da0..bec2e316 100644 --- a/src/main/resources/templates/security/auto-redact.html +++ b/src/main/resources/templates/security/auto-redact.html @@ -1,84 +1,83 @@ - + + + + - - -
      -
      -
      -

      -
      -
      -
      -

      -
      -
      - -
      + +
      +
      + +

      +
      +
      +
      +

      + +
      + +
      -
      - - -
      +
      + + +
      -
      - - -
      +
      + + +
      - - + + - + +
      + + +
      +
      + + +
      +
      + + +
      -
      - - -
      +
      + + +
      -
      - - -
      - -
      - - -
      - -
      - - -
      - - - + + +
      +
      -
      -
      - + diff --git a/src/main/resources/templates/security/cert-sign.html b/src/main/resources/templates/security/cert-sign.html index 20148355..bfadb5a7 100644 --- a/src/main/resources/templates/security/cert-sign.html +++ b/src/main/resources/templates/security/cert-sign.html @@ -1,113 +1,106 @@ - - + + + + - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      - -
      -
      - -
      - -
      -
      - -
      - - - -
      - -
      -
      - -
      - -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      + +
      + +
      +
      + +
      + + + +
      + +
      +
      + +
      + +
      + +
      +
      +
      -
      +
      +
      - - - + + \ No newline at end of file diff --git a/src/main/resources/templates/security/change-permissions.html b/src/main/resources/templates/security/change-permissions.html index cf0cd3b0..9c76bafa 100644 --- a/src/main/resources/templates/security/change-permissions.html +++ b/src/main/resources/templates/security/change-permissions.html @@ -1,71 +1,69 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -

      -
      -
      - -
      -
      -
      - -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      - -
      -
      -
      - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +

      +
      +
      + +
      +
      + +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      +
      +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/security/get-info-on-pdf.html b/src/main/resources/templates/security/get-info-on-pdf.html index 317c4e5e..00b425d4 100644 --- a/src/main/resources/templates/security/get-info-on-pdf.html +++ b/src/main/resources/templates/security/get-info-on-pdf.html @@ -1,165 +1,152 @@ - - - -
      -
      -
      -

      -
      -
      -
      -

      -
      -
      -
      - + + + + -
      -
      - -
      - -
      + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      + +
      + +
      - - -
      - -
      -
      -
      - -
      -
      -
      - + card.appendChild(content); + return card; + } + function createButtonElement(key, safeKey, depth) { + const buttonElem = document.createElement('button'); + buttonElem.className = 'btn btn-link'; + buttonElem.type = 'button'; + buttonElem.dataset.bsToggle = "collapse"; + buttonElem.dataset.bsTarget = `#${safeKey}-content-${depth}`; + buttonElem.setAttribute('aria-expanded', 'true'); + buttonElem.setAttribute('aria-controls', `${safeKey}-content-${depth}`); + buttonElem.textContent = key; + return buttonElem; + } + const collapsibleElems = document.querySelectorAll('[data-bs-toggle="collapse"]'); + collapsibleElems.forEach(elem => { + new bootstrap.Collapse(elem); + }); + +
      +
      +
      +
      + +
      + \ No newline at end of file diff --git a/src/main/resources/templates/security/remove-password.html b/src/main/resources/templates/security/remove-password.html index fe0c4a3c..950d6b1f 100644 --- a/src/main/resources/templates/security/remove-password.html +++ b/src/main/resources/templates/security/remove-password.html @@ -1,37 +1,37 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      - -
      -
      -
      - - -
      -
      -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      +
      + + +
      +
      +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/security/remove-watermark.html b/src/main/resources/templates/security/remove-watermark.html index a87a1bd7..64b2fa7e 100644 --- a/src/main/resources/templates/security/remove-watermark.html +++ b/src/main/resources/templates/security/remove-watermark.html @@ -1,36 +1,36 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      - -
      -
      -
      - - -
      -
      - -
      -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + +
      +
      + + +
      +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/security/sanitize-pdf.html b/src/main/resources/templates/security/sanitize-pdf.html index 8d393cba..3d0f4deb 100644 --- a/src/main/resources/templates/security/sanitize-pdf.html +++ b/src/main/resources/templates/security/sanitize-pdf.html @@ -1,53 +1,52 @@ - + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      - -
      -
      -
      -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      -
      - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      +
      + +
      +
      +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/sign.html b/src/main/resources/templates/sign.html index 48d39e41..57a2d31d 100644 --- a/src/main/resources/templates/sign.html +++ b/src/main/resources/templates/sign.html @@ -1,333 +1,276 @@ + + + + + + + - - - - - - - - - +
      -
      -
      -

      -
      -
      -
      -

      +
      + +

      +
      +
      +
      +

      - -
      - + document.querySelectorAll(".show-on-file-selected").forEach(el => { + el.style.cssText = ''; + }) + } + }); + document.addEventListener("DOMContentLoaded", () => { + document.querySelectorAll(".show-on-file-selected").forEach(el => { + el.style.cssText = "display:none !important"; + }) + }); + +
      +
      +
      + +
      +
      + +
      + + + -
      -
      - -
      - - - - -
      -
      - - - - -
      - -
      - - - - - - - - - -
      -
      - - -
      - - -
      - - - -
      - -
      - - -
      - -
      - - + // This library does not listen for canvas changes, so after the canvas is automatically + // cleared by the browser, SignaturePad#isEmpty might still return false, even though the + // canvas looks empty, because the internal data of this library wasn't cleared. To make sure + // that the state of this library is consistent with visual state of the canvas, you + // have to clear it manually. + signaturePad.clear(); + } + new IntersectionObserver((entries, observer) => { + if (entries.some(entry => entry.intersectionRatio > 0)) { + resizeCanvas(); + } + }).observe(signaturePadCanvas); + new ResizeObserver(resizeCanvas).observe(signaturePadCanvas); + +
      +
      + + + + +
      +
      + +
      +
      + + +
      + + +
      + + + +
      +
      + + +
      + +
      + +
      +
      -
      +
      +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/split-by-size-or-count.html b/src/main/resources/templates/split-by-size-or-count.html index 0b6f9b52..f5b58ef9 100644 --- a/src/main/resources/templates/split-by-size-or-count.html +++ b/src/main/resources/templates/split-by-size-or-count.html @@ -1,43 +1,38 @@ - + + + + - - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      - - - -
      - - - -
      - - -
      - -
      -
      +
      + +

      +
      +
      +
      +

      +
      +
      + + +
      + + +
      + +
      - +
      -
      +
      +
      - + diff --git a/src/main/resources/templates/split-pdf-by-sections.html b/src/main/resources/templates/split-pdf-by-sections.html index 94900977..dc8b5476 100644 --- a/src/main/resources/templates/split-pdf-by-sections.html +++ b/src/main/resources/templates/split-pdf-by-sections.html @@ -1,95 +1,79 @@ - + + + + + - - - +
      -
      -
      -

      -
      -
      -
      -

      -
      -
      +
      + +

      +
      +
      +
      +

      + +
      + + +
      + + +
      +
      + -
      - - - -
      -
      + // Initial draw + updateVisualAid(); + +
      + + +
      - +
      -
      +
      +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html index 872dc323..c6beffac 100644 --- a/src/main/resources/templates/split-pdfs.html +++ b/src/main/resources/templates/split-pdfs.html @@ -1,43 +1,42 @@ - - - - - - + + + + +
      -
      -
      -

      -
      -
      -
      -

      -

      -

      -

      -

      -

      -

      -

      -

      +
      + +

      +
      +
      +
      +

      +

      +

      +

      +

      +

      +

      +

      +

      -
      -
      + +
      -
      - - -
      -
      - -
      -
      +
      + +
      +
      + +
      +
      -
      +
      +
      - + From 094fde98019123766ee380a2ba5f92bd79e312d3 Mon Sep 17 00:00:00 2001 From: Sherif Metwally Date: Sat, 17 Feb 2024 00:23:11 +0200 Subject: [PATCH 004/200] Update-helm-chart (#815) * upgrade app in helm chart to 0.20.2 * update and correct UI env variable names in chart values.yaml --- chart/stirling-pdf/Chart.yaml | 2 +- chart/stirling-pdf/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml index 686d2422..94bc50fc 100644 --- a/chart/stirling-pdf/Chart.yaml +++ b/chart/stirling-pdf/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.14.2 +appVersion: 0.20.2 description: locally hosted web application that allows you to perform various operations on PDF files home: https://github.com/Stirling-Tools/Stirling-PDF keywords: diff --git a/chart/stirling-pdf/values.yaml b/chart/stirling-pdf/values.yaml index 3c4ca888..e9e00c3e 100644 --- a/chart/stirling-pdf/values.yaml +++ b/chart/stirling-pdf/values.yaml @@ -16,11 +16,11 @@ commonLabels: {} # team_name: dev envs: [] -# - name: PP_HOME_NAME +# - name: UI_APP_NAME # value: "Stirling PDF" -# - name: APP_HOME_DESCRIPTION +# - name: UI_HOME_DESCRIPTION # value: "Your locally hosted one-stop-shop for all your PDF needs." -# - name: APP_NAVBAR_NAME +# - name: UI_APP_NAVBAR_NAME # value: "Stirling PDF" # - name: ALLOW_GOOGLE_VISIBILITY # value: "true" From 6fc9c7be90a7ab3736dc85bf73cea7403e48b697 Mon Sep 17 00:00:00 2001 From: Aliarev Date: Fri, 16 Feb 2024 23:24:26 +0100 Subject: [PATCH 005/200] Update french translation (#814) --- src/main/resources/messages_fr_FR.properties | 168 +++++++++---------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 7bda2156..e40d9291 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -11,7 +11,7 @@ imgPrompt=Choisir une image genericSubmit=Envoyer processTimeWarning=Attention, ce processus peut prendre jusqu\u2019à une minute en fonction de la taille du fichier. pageOrderPrompt=Ordre des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0: -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=Sélection des pages (entrez une liste de numéros de page séparés par des virgules ou des fonctions telles que 2n+1)\u00a0: goToPage=Aller true=Vrai false=Faux @@ -43,10 +43,10 @@ red=Rouge green=Vert blue=Bleu custom=Personnalisé\u2026 -WorkInProgess=Work in progress, May not work or be buggy, Please report any problems! -poweredBy=Powered by -yes=Yes -no=No +WorkInProgess=En cours de développement, merci de nous remonter les problèmes que vous pourriez constater! +poweredBy=Propulsé par +yes=Oui +no=Non changedCredsMessage=Les identifiants ont été mis à jour\u00a0! notAuthenticatedMessage=Utilisateur non authentifié. userNotFoundMessage=Utilisateur non trouvé. @@ -57,24 +57,24 @@ usernameExistsMessage=Le nouveau nom d\u2019utilisateur existe déjà. ############### # Pipeline # ############### -pipeline.header=Pipeline Menu (Alpha) -pipeline.uploadButton=Upload Custom -pipeline.configureButton=Configure -pipeline.defaultOption=Custom -pipeline.submitButton=Submit +pipeline.header=Menu Pipeline (Alpha) +pipeline.uploadButton=Télécharger une personnalisation +pipeline.configureButton=Configurer +pipeline.defaultOption=Personnaliser +pipeline.submitButton=Soumettre ###################### # Pipeline Options # ###################### -pipelineOptions.header=Pipeline Configuration -pipelineOptions.pipelineNameLabel=Pipeline Name -pipelineOptions.saveSettings=Save Operation Settings -pipelineOptions.pipelineNamePrompt=Enter pipeline name here -pipelineOptions.selectOperation=Select Operation -pipelineOptions.addOperationButton=Add operation +pipelineOptions.header=Configuration du pipeline +pipelineOptions.pipelineNameLabel=Nom du pipeline +pipelineOptions.saveSettings=Sauvegarder la configuration +pipelineOptions.pipelineNamePrompt=Entrez ici le nom du pipeline +pipelineOptions.selectOperation=Sélectionner une opération +pipelineOptions.addOperationButton=Ajouter une opération pipelineOptions.pipelineHeader=Pipeline: -pipelineOptions.saveButton=Download -pipelineOptions.validateButton=Validate +pipelineOptions.saveButton=Télécharger +pipelineOptions.validateButton=Valider @@ -147,7 +147,7 @@ adminUserSettings.role=Rôle adminUserSettings.actions=Actions adminUserSettings.apiUser=Utilisateur API limité adminUserSettings.webOnlyUser=Utilisateur Web uniquement -adminUserSettings.demoUser=Demo User (No custom settings) +adminUserSettings.demoUser=Demo User (Paramètres par défaut) adminUserSettings.forceChange=Forcer l\u2019utilisateur à changer son nom d\u2019utilisateur/mot de passe lors de la connexion adminUserSettings.submit=Ajouter @@ -159,7 +159,7 @@ home.searchBar=Rechercher des fonctionnalités... home.viewPdf.title=Visionner le PDF -home.viewPdf.desc=Visionner, annoter, ajouter du texte ou des images +home.viewPdf.desc=Visionner, annoter, ajouter du texte ou des images. viewPdf.tags=visualiser,lire,annoter,texte,image home.multiTool.title=Outil multifonction PDF @@ -168,7 +168,7 @@ multiTool.tags=outil multifonction,opération multifonction,interface utilisateu home.merge.title=Fusionner home.merge.desc=Fusionnez facilement plusieurs PDF en un seul. -merge.tags=fusionner,opérations sur les pages,backeend,server side,merge +merge.tags=fusionner,opérations sur les pages,backend,server side,merge home.split.title=Diviser home.split.desc=Divisez un PDF en plusieurs documents. @@ -284,9 +284,9 @@ home.removeBlanks.title=Supprimer les pages vierges home.removeBlanks.desc=Détectez et supprimez les pages vierges d\u2019un PDF. removeBlanks.tags=pages vierges,supprimer,nettoyer,cleanup,streamline,non-content,organize -home.removeAnnotations.title=Remove Annotations -home.removeAnnotations.desc=Removes all comments/annotations from a PDF -removeAnnotations.tags=comments,highlight,notes,markup,remove +home.removeAnnotations.title=Supprimer les annotations +home.removeAnnotations.desc=Supprimer tous les commentaires/annotations d\u2019un PDF. +removeAnnotations.tags=commentaires,supprimer,annotations,highlight,notes,markup,remove home.compare.title=Comparer home.compare.desc=Comparez et visualisez les différences entre deux PDF. @@ -370,7 +370,7 @@ home.autoRedact.desc=Caviardez automatiquement les informations sensibles d\u201 autoRedact.tags=caviarder,redact,auto home.tableExtraxt.title=PDF en CSV -home.tableExtraxt.desc=Extrait les tableaux d\u2019un PDF et les transforme en CSV +home.tableExtraxt.desc=Extrait les tableaux d\u2019un PDF et les transforme en CSV. tableExtraxt.tags=CSV,Table Extraction,extract,convert @@ -380,16 +380,16 @@ autoSizeSplitPDF.tags=pdf,split,document,organization home.overlay-pdfs.title=Incrustation de PDF -home.overlay-pdfs.desc=Incrustation d\u2019un PDF sur un autre PDF -overlay-pdfs.tags=Overlay +home.overlay-pdfs.desc=Incrustation d\u2019un PDF sur un autre PDF. +overlay-pdfs.tags=Overlay,incrustation -home.split-by-sections.title=Split PDF by Sections -home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections -split-by-sections.tags=Section Split, Divide, Customize +home.split-by-sections.title=Séparer un PDF en sections +home.split-by-sections.desc=Diviser chaque page d\u2019un PDF en sections horizontales/verticales plus petites. +split-by-sections.tags=Sections,Diviser,Section Split, Divide, Customize -home.AddStampRequest.title=Add Stamp to PDF -home.AddStampRequest.desc=Add text or add image stamps at set locations -AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.AddStampRequest.title=Ajouter un tampon sur un PDF +home.AddStampRequest.desc=Ajouter un texte ou l\u2019image d\u2019un tampon à un emplacement défini. +AddStampRequest.tags=Tampon,Ajouter,Stamp,Add image,center image,Watermark,PDF,Embed,Customize ########################### @@ -467,37 +467,37 @@ HTMLToPDF.header=HTML en PDF HTMLToPDF.help=Accepte les fichiers HTML et les ZIP contenant du HTML, du CSS, des images, etc. (requis). HTMLToPDF.submit=Convertir HTMLToPDF.credit=Utilise WeasyPrint. -HTMLToPDF.zoom=Zoom level for displaying the website. -HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default) -HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default) -HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default) -HTMLToPDF.printBackground=Render the background of websites. -HTMLToPDF.defaultHeader=Enable Default Header (Name and page number) -HTMLToPDF.cssMediaType=Change the CSS media type of the page. -HTMLToPDF.none=None -HTMLToPDF.print=Print -HTMLToPDF.screen=Screen +HTMLToPDF.zoom=Niveau de zoom pour l\u2019affichage du site web. +HTMLToPDF.pageWidth=Largeur de la page en centimètres. (Vide par défaut) +HTMLToPDF.pageHeight=Hauteur de la page en centimètres. (Vide par défaut) +HTMLToPDF.marginTop=Marge supérieure de la page en millimètres. (Vide par défaut) +HTMLToPDF.marginBottom=Marge inférieure de la page en millimètres. (Vide par défaut) +HTMLToPDF.marginLeft=Marge gauche de la page en millimètres. (Vide par défaut) +HTMLToPDF.marginRight=Marge droite de la page en millimètres. (Vide par défaut) +HTMLToPDF.printBackground=Restituer l\u2019image de fond des sites web. +HTMLToPDF.defaultHeader=Activer l\u2019entête par défaut (Nom et numéro de page) +HTMLToPDF.cssMediaType=Modifier le type de média CSS de la page. +HTMLToPDF.none=Aucun +HTMLToPDF.print=Imprimer +HTMLToPDF.screen=Écran #AddStampRequest -AddStampRequest.header=Stamp PDF -AddStampRequest.title=Stamp PDF -AddStampRequest.stampType=Stamp Type -AddStampRequest.stampText=Stamp Text -AddStampRequest.stampImage=Stamp Image +AddStampRequest.header=Tampon PDF +AddStampRequest.title=Tampon PDF +AddStampRequest.stampType=Type de tampon +AddStampRequest.stampText=Tampon texte +AddStampRequest.stampImage=Tampon image AddStampRequest.alphabet=Alphabet -AddStampRequest.fontSize=Font/Image Size +AddStampRequest.fontSize=Taille de fonte/image AddStampRequest.rotation=Rotation -AddStampRequest.opacity=Opacity +AddStampRequest.opacity=Opacité AddStampRequest.position=Position -AddStampRequest.overrideX=Override X Coordinate -AddStampRequest.overrideY=Override Y Coordinate -AddStampRequest.customMargin=Custom Margin -AddStampRequest.customColor=Custom Text Color -AddStampRequest.submit=Submit +AddStampRequest.overrideX=Définir coordonnées X +AddStampRequest.overrideY=Définir coordonnées Y +AddStampRequest.customMargin=Marge personnalisée +AddStampRequest.customColor=Couleur de texte personnalisée +AddStampRequest.submit=Soumettre #sanitizePDF @@ -586,11 +586,11 @@ scalePages.submit=Ajuster certSign.title=Signer avec un certificat certSign.header=Signer avec un certificat (Travail en cours) certSign.selectPDF=PDF à signer -certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below. +certSign.jksNote=Note: Si votre type de certificat n\u2019est pas listé ci\u002Ddessous, merci de le convertir en fichier Java Keystore (.jks) en utilisant l\u2019outil en ligne de commande keytool. Puis choisissez l\u2019option Fichier .jks ci\u002Ddessous. certSign.selectKey=Fichier de clé privée (format PKCS#8, peut être .pem ou .der) certSign.selectCert=Fichier de certificat (format X.509, peut être .pem ou .der) certSign.selectP12=Fichier keystore de clés PKCS#12 (.p12 ou .pfx) (facultatif, s\u2019il n\u2019est fourni, il doit contenir votre clé privée et votre certificat) -certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore): +certSign.selectJKS=Sélectionner votre fichier Java Keystore File (.jks or .keystore): certSign.certType=Type de certificat certSign.password=Mot de passe keystore ou clé privée le cas échéant certSign.showSig=Afficher la signature @@ -611,9 +611,9 @@ removeBlanks.submit=Supprimer les pages vierges #removeAnnotations -removeAnnotations.title=Remove Annotations -removeAnnotations.header=Remove Annotations -removeAnnotations.submit=Remove +removeAnnotations.title=Supprimer les annotations +removeAnnotations.header=Supprimer les annotations +removeAnnotations.submit=Supprimer #compare @@ -695,14 +695,14 @@ fileToPDF.submit=Convertir #compress -compress.title=Compresser -compress.header=Compresser +compress.title=Compresser un PDF +compress.header=Compresser un PDF (lorsque c\u2019est possible!) compress.credit=Ce service utilise Ghostscript pour la compression et l\u2019optimisation des PDF. compress.selectText.1=Mode manuel \u2013 de 1 à 4 compress.selectText.2=Niveau d\u2019optimisation compress.selectText.3=4 (terrible pour les images textuelles) compress.selectText.4=Mode automatique \u2013 ajuste automatiquement la qualité pour obtenir le PDF à la taille exacte -compress.selectText.5=Taille PDF attendue (par exemple, 25\u202fMo, 10,8\u202fMo, 25\u202fKo) +compress.selectText.5=Taille PDF attendue (par exemple, 25\u202fMB, 10,8\u202fMB, 25\u202fKB) compress.submit=Compresser @@ -733,8 +733,8 @@ multiTool.title=Outil multifonction PDF multiTool.header=Outil multifonction PDF #view pdf -viewPdf.title=View PDF -viewPdf.header=View PDF +viewPdf.title=Visualiser un PDF +viewPdf.header=Visualiser un PDF #pageRemover pageRemover.title=Supprimer des pages @@ -789,7 +789,7 @@ pdfToImage.multi=Plusieurs images pdfToImage.colorType=Type d\u2019impression pdfToImage.color=Couleur pdfToImage.grey=Niveaux de gris -pdfToImage.blackwhite=Noir et blanc (peut engendre une perde de données\u00a0!) +pdfToImage.blackwhite=Noir et blanc (peut engendrer une perte de données\u00a0!) pdfToImage.submit=Convertir @@ -868,7 +868,7 @@ changeMetadata.keywords=Mots clés changeMetadata.modDate=Date de modification (yyyy/MM/dd HH:mm:ss) changeMetadata.producer=Producteur changeMetadata.subject=Sujet -changeMetadata.trapped=Défoncé (technique d’impression) +changeMetadata.trapped=Recouvrement (technique d’impression) changeMetadata.selectText.4=Autres métadonnées changeMetadata.selectText.5=Ajouter une entrée de métadonnées personnalisée changeMetadata.submit=Modifier @@ -925,6 +925,7 @@ PDFToCSV.prompt=Choisir la page pour en extraire le tableau PDFToCSV.submit=Extrait #split-by-size-or-count +split-by-size-or-count.title=Séparer le PDF par taille ou par nombre split-by-size-or-count.header=Séparer le PDF par taille ou par nombre split-by-size-or-count.type.label=Sélectionner le type de division split-by-size-or-count.type.size=Par taille @@ -936,19 +937,20 @@ split-by-size-or-count.submit=Séparer #overlay-pdfs -overlay-pdfs.header=Overlay PDF Files +overlay-pdfs.title=Incrustation de PDF +overlay-pdfs.header=Incrustation de PDF overlay-pdfs.baseFile.label=Sélectionner le fichier PDF de base overlay-pdfs.overlayFiles.label=Sélectionner les fichiers PDF à superposer -overlay-pdfs.mode.label=Select Overlay Mode -overlay-pdfs.mode.sequential=Sequential Overlay -overlay-pdfs.mode.interleaved=Interleaved Overlay +overlay-pdfs.mode.label=Sélectionner le mode d\u2019incrustation +overlay-pdfs.mode.sequential=Superposition séquentielle +overlay-pdfs.mode.interleaved=Superposition entrelacée overlay-pdfs.mode.fixedRepeat=Superposition à répétition fixe overlay-pdfs.counts.label=Nombre de superpositions (pour le mode de répétition fixe) -overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1) -overlay-pdfs.position.label=Select Overlay Position +overlay-pdfs.counts.placeholder=Compteurs (séparés par des virgules, exemple : 2,3,1) +overlay-pdfs.position.label=Définir la position de l\u2019incrustation overlay-pdfs.position.foreground=Premier plan overlay-pdfs.position.background=Arrière-plan -overlay-pdfs.submit=Submit +overlay-pdfs.submit=Soumettre #split-by-sections @@ -962,11 +964,9 @@ split-by-sections.submit=Diviser le PDF #licenses -licenses.nav=Licenses -licenses.title=3rd Party Licenses -licenses.header=3rd Party Licenses +licenses.nav=Licences +licenses.title=Licences tierces +licenses.header=Licences tierces licenses.module=Module licenses.version=Version -licenses.license=License - - +licenses.license=Licence From 010426d488adae315bc6f118b9367e1d5f5570c1 Mon Sep 17 00:00:00 2001 From: Ludy Date: Fri, 16 Feb 2024 23:42:56 +0100 Subject: [PATCH 006/200] Document (#803) * Update HowToAddNewLanguage.md * Update HowToUseOCR.md * Update LocalRunGuide.md * Update README.md * Update LocalRunGuide.md * Update README.md --------- Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- HowToAddNewLanguage.md | 4 ++-- HowToUseOCR.md | 2 +- LocalRunGuide.md | 4 ++-- README.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HowToAddNewLanguage.md b/HowToAddNewLanguage.md index 9f8e3f39..385ccbbc 100644 --- a/HowToAddNewLanguage.md +++ b/HowToAddNewLanguage.md @@ -12,7 +12,7 @@ https://github.com/Stirling-Tools/Stirling-PDF/blob/main/src/main/resources/temp and add a flag svg file to https://github.com/Stirling-Tools/Stirling-PDF/tree/main/src/main/resources/static/images/flags Any SVG flags are fine, i got most of mine from [here](https://flagicons.lipis.dev/) -If your language isnt represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia +If your language isn't represented by a flag just find whichever closely matches it, such as for Arabic i chose Saudi Arabia For example to add Polish you would add @@ -32,7 +32,7 @@ Copy and rename it to messages_{your data-language-code here}.properties, in the Then simply translate all property entries within that file and make a PR into main for others to use! -If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but wont be able to verify the translations themselves) +If you do not have a java IDE i am happy to verify the changes worked once you raise PR (but won't be able to verify the translations themselves) diff --git a/HowToUseOCR.md b/HowToUseOCR.md index 388ab438..d3e5744c 100644 --- a/HowToUseOCR.md +++ b/HowToUseOCR.md @@ -2,7 +2,7 @@ This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker. -## My OCR used to work and now doesnt! +## My OCR used to work and now doesn't! Please update your tesseract docker volume path version from 4.00 to 5 ## How does the OCR Work diff --git a/LocalRunGuide.md b/LocalRunGuide.md index 3c9b2716..9858f300 100644 --- a/LocalRunGuide.md +++ b/LocalRunGuide.md @@ -65,7 +65,7 @@ sudo make install ``` ### Step 3: Install Additional Software -Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for patern recognition functionality. +Next we need to install LibreOffice for conversions, ocrmypdf for OCR, and opencv for pattern recognition functionality. Install the following software: @@ -264,7 +264,7 @@ sudo systemctl restart stirlingpdf.service Remember to set the necessary environment variables before running the project if you want to customize the application the list can be seen in the main readme. -You can do this in the terminal by using the `export` command or -D arguements to java -jar command: +You can do this in the terminal by using the `export` command or -D argument to java -jar command: ```bash export APP_HOME_NAME="Stirling PDF" diff --git a/README.md b/README.md index 5876a7e2..b04da526 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/) [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf) [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex) -[![Github Sponser](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle) +[![Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle) [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af) @@ -262,7 +262,7 @@ For API usage you must provide a header with 'X-API-Key' and the associated API - Redact text (Via UI not just automated way) - Add Forms - Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing -- Fill forms mannual and automatic +- Fill forms manually or automatically ### Q2: Why is my application downloading .htm files? This is an issue caused commonly by your NGINX configuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files. From a5f07778926da2e883b202c637906b44577e6a4d Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:10:00 +0000 Subject: [PATCH 007/200] Update ConfigInitializer.java for auto settings removal --- .../SPDF/config/ConfigInitializer.java | 79 ++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java index a5d05999..7bceaf8f 100644 --- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java +++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java @@ -79,6 +79,16 @@ public class ConfigInitializer return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : ""; }; + Function getIndentationLevel = + line -> { + int count = 0; + for (char ch : line.toCharArray()) { + if (ch == ' ') count++; + else break; + } + return count; + }; + Set userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet()); for (String line : templateLines) { @@ -134,10 +144,77 @@ public class ConfigInitializer .map(extractKey) .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey)); if (!isPresentInTemplate && !isCommented.apply(userLine)) { - mergedLines.add(userLine); + if (!childOfTemplateEntry( + isCommented, + extractKey, + getIndentationLevel, + userLines, + userLine, + templateLines)) { + // check if userLine is a child of a entry within templateLines or not, if child + // of parent in templateLines then dont add to mergedLines, if anything else + // then add + mergedLines.add(userLine); + } } } Files.write(outputPath, mergedLines, StandardCharsets.UTF_8); } + + // New method to check if a userLine is a child of an entry in templateLines + boolean childOfTemplateEntry( + Function isCommented, + Function extractKey, + Function getIndentationLevel, + List userLines, + String userLine, + List templateLines) { + String userKey = extractKey.apply(userLine).trim(); + int userIndentation = getIndentationLevel.apply(userLine); + + // Start by assuming the line is not a child of an entry in templateLines + boolean isChild = false; + + // Iterate backwards through userLines from the current line to find any parent + for (int i = userLines.indexOf(userLine) - 1; i >= 0; i--) { + String potentialParentLine = userLines.get(i); + int parentIndentation = getIndentationLevel.apply(potentialParentLine); + + // Check if we've reached a potential parent based on indentation + if (parentIndentation < userIndentation) { + String parentKey = extractKey.apply(potentialParentLine).trim(); + + // Now, check if this potential parent or any of its parents exist in templateLines + boolean parentExistsInTemplate = + templateLines.stream() + .filter(line -> !isCommented.apply(line)) // Skip commented lines + .anyMatch( + templateLine -> { + String templateKey = + extractKey.apply(templateLine).trim(); + return parentKey.equalsIgnoreCase(templateKey); + }); + + if (!parentExistsInTemplate) { + // If the parent does not exist in template, check the next level parent + userIndentation = + parentIndentation; // Update userIndentation to the parent's indentation + // for next iteration + if (parentIndentation == 0) { + // If we've reached the top-level parent and it's not in template, the + // original line is considered not a child + isChild = false; + break; + } + } else { + // If any parent exists in template, the original line is considered a child + isChild = true; + break; + } + } + } + + return isChild; // Return true if the line is not a child of any entry in templateLines + } } From 148dcdaee7680d45ce46cb4f835e50721117d510 Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Sat, 17 Feb 2024 14:22:15 +0100 Subject: [PATCH 008/200] Update messages_it_IT.properties (#816) --- src/main/resources/messages_it_IT.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 70793c70..4557da8d 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -11,7 +11,7 @@ imgPrompt=Scegli immagine/i genericSubmit=Invia processTimeWarning=Nota: Questo processo potrebbe richiedere fino a un minuto in base alla dimensione dei file pageOrderPrompt=Ordine delle pagine (inserisci una lista di numeri separati da virgola): -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=Selezione pagina personalizzata (inserisci un elenco separato da virgole di numeri di pagina 1,5,6 o funzioni come 2n+1) : goToPage=Vai true=Vero false=Falso From 918f5954b7f33890dd25bc634ced9a192926b197 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:23:10 +0000 Subject: [PATCH 009/200] Bump io.micrometer:micrometer-core from 1.12.2 to 1.12.3 (#806) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.12.2 to 1.12.3. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.2...v1.12.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 727b2b53..52c8970c 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,7 @@ dependencies { implementation 'org.bouncycastle:bcprov-jdk18on:1.77' implementation 'org.bouncycastle:bcpkix-jdk18on:1.77' implementation 'org.springframework.boot:spring-boot-starter-actuator:3.2.2' - implementation 'io.micrometer:micrometer-core:1.12.2' + implementation 'io.micrometer:micrometer-core:1.12.3' implementation group: 'com.google.zxing', name: 'core', version: '3.5.2' // https://mvnrepository.com/artifact/org.commonmark/commonmark implementation 'org.commonmark:commonmark:0.21.0' From a0acafcefce317d981a4af7372767f21a02fe00d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Feb 2024 13:24:38 +0000 Subject: [PATCH 010/200] Bump org.springframework:spring-webmvc from 6.1.2 to 6.1.3 (#713) Bumps [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.2...v6.1.3) --- updated-dependencies: - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 52c8970c..413383e4 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,7 @@ dependencies { //security updates implementation 'ch.qos.logback:logback-classic:1.4.14' implementation 'ch.qos.logback:logback-core:1.4.14' - implementation 'org.springframework:spring-webmvc:6.1.2' + implementation 'org.springframework:spring-webmvc:6.1.3' implementation("io.github.pixee:java-security-toolkit:1.1.2") From 56e3ec121981fc06ab97d2d4c2bf7832de8fbd7e Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 17 Feb 2024 19:28:32 +0000 Subject: [PATCH 011/200] Update HowToUseOCR.md --- HowToUseOCR.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HowToUseOCR.md b/HowToUseOCR.md index d3e5744c..d68283f7 100644 --- a/HowToUseOCR.md +++ b/HowToUseOCR.md @@ -3,7 +3,7 @@ This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker. ## My OCR used to work and now doesn't! -Please update your tesseract docker volume path version from 4.00 to 5 +The paths have changed for the tessadata locations on new docker images, please use ``/usr/share/tessdata`` (Others should still work for backwards compatability but might not) ## How does the OCR Work Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition. From 8d9f0361d0a7db2c4eae62d8f58530eb55eadf8b Mon Sep 17 00:00:00 2001 From: Ludy Date: Sat, 17 Feb 2024 20:56:56 +0100 Subject: [PATCH 012/200] Fix Serbia Language (#822) * Fix Serbia Language * Rename messages_sr_Latn_RS.properties to messages_sr_LATN_RS.properties * Update languages.html * Update README.md --- README.md | 2 +- ...sr-Latn-RS.properties => messages_sr_LATN_RS.properties} | 0 src/main/resources/static/js/languageSelection.js | 2 +- src/main/resources/templates/about.html | 2 +- src/main/resources/templates/account.html | 2 +- src/main/resources/templates/addUsers.html | 2 +- src/main/resources/templates/auto-split-pdf.html | 2 +- src/main/resources/templates/change-creds.html | 2 +- src/main/resources/templates/convert/book-to-pdf.html | 2 +- src/main/resources/templates/convert/file-to-pdf.html | 2 +- src/main/resources/templates/convert/html-to-pdf.html | 2 +- src/main/resources/templates/convert/img-to-pdf.html | 2 +- src/main/resources/templates/convert/markdown-to-pdf.html | 2 +- src/main/resources/templates/convert/pdf-to-book.html | 2 +- src/main/resources/templates/convert/pdf-to-csv.html | 2 +- src/main/resources/templates/convert/pdf-to-html.html | 2 +- src/main/resources/templates/convert/pdf-to-img.html | 2 +- src/main/resources/templates/convert/pdf-to-pdfa.html | 2 +- .../resources/templates/convert/pdf-to-presentation.html | 2 +- src/main/resources/templates/convert/pdf-to-text.html | 2 +- src/main/resources/templates/convert/pdf-to-word.html | 2 +- src/main/resources/templates/convert/pdf-to-xml.html | 2 +- src/main/resources/templates/convert/url-to-pdf.html | 2 +- src/main/resources/templates/crop.html | 2 +- src/main/resources/templates/error.html | 2 +- src/main/resources/templates/extract-page.html | 2 +- src/main/resources/templates/fragments/languages.html | 2 +- src/main/resources/templates/fragments/navbar.html | 1 - src/main/resources/templates/home.html | 2 +- src/main/resources/templates/licenses.html | 2 +- src/main/resources/templates/login.html | 6 +++--- src/main/resources/templates/merge-pdfs.html | 2 +- src/main/resources/templates/misc/add-image.html | 2 +- src/main/resources/templates/misc/add-page-numbers.html | 2 +- src/main/resources/templates/misc/adjust-contrast.html | 2 +- src/main/resources/templates/misc/auto-crop.html | 2 +- src/main/resources/templates/misc/auto-rename.html | 2 +- src/main/resources/templates/misc/change-metadata.html | 2 +- src/main/resources/templates/misc/compare.html | 2 +- src/main/resources/templates/misc/compress-pdf.html | 3 +-- src/main/resources/templates/misc/extract-image-scans.html | 2 +- src/main/resources/templates/misc/extract-images.html | 2 +- src/main/resources/templates/misc/flatten.html | 2 +- src/main/resources/templates/misc/ocr-pdf.html | 2 +- src/main/resources/templates/misc/remove-annotations.html | 2 +- src/main/resources/templates/misc/remove-blanks.html | 2 +- src/main/resources/templates/misc/repair.html | 2 +- src/main/resources/templates/misc/show-javascript.html | 2 +- src/main/resources/templates/misc/stamp.html | 2 +- src/main/resources/templates/multi-page-layout.html | 2 +- src/main/resources/templates/multi-tool.html | 2 +- src/main/resources/templates/overlay-pdf.html | 2 +- src/main/resources/templates/pdf-organizer.html | 2 +- src/main/resources/templates/pdf-to-single-page.html | 2 +- src/main/resources/templates/pipeline.html | 2 +- src/main/resources/templates/remove-pages.html | 2 +- src/main/resources/templates/rotate-pdf.html | 2 +- src/main/resources/templates/scale-pages.html | 2 +- src/main/resources/templates/security/add-password.html | 2 +- src/main/resources/templates/security/add-watermark.html | 2 +- src/main/resources/templates/security/auto-redact.html | 2 +- src/main/resources/templates/security/cert-sign.html | 2 +- .../resources/templates/security/change-permissions.html | 2 +- src/main/resources/templates/security/get-info-on-pdf.html | 2 +- src/main/resources/templates/security/remove-password.html | 2 +- src/main/resources/templates/security/remove-watermark.html | 2 +- src/main/resources/templates/security/sanitize-pdf.html | 2 +- src/main/resources/templates/sign.html | 2 +- src/main/resources/templates/split-by-size-or-count.html | 2 +- src/main/resources/templates/split-pdf-by-sections.html | 2 +- src/main/resources/templates/split-pdfs.html | 2 +- 71 files changed, 71 insertions(+), 73 deletions(-) rename src/main/resources/{messages_sr-Latn-RS.properties => messages_sr_LATN_RS.properties} (100%) diff --git a/README.md b/README.md index b04da526..690adacd 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,7 @@ Stirling PDF currently supports 26! - Hindi (हिंदी) (hi_IN) - Hungarian (Magyar) (hu_HU) - Bulgarian (Български) (bg_BG) -- Sebian Latin alphabet (Srpski) (sr-Latn-RS) +- Sebian Latin alphabet (Srpski) (sr_LATN_RS) ## Contributing (creating issues, translations, fixing bugs, etc.) diff --git a/src/main/resources/messages_sr-Latn-RS.properties b/src/main/resources/messages_sr_LATN_RS.properties similarity index 100% rename from src/main/resources/messages_sr-Latn-RS.properties rename to src/main/resources/messages_sr_LATN_RS.properties diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js index af67da48..413bebe0 100644 --- a/src/main/resources/static/js/languageSelection.js +++ b/src/main/resources/static/js/languageSelection.js @@ -26,7 +26,7 @@ document.addEventListener("DOMContentLoaded", function () { }); function setLanguageForDropdown(dropdownClass) { - const defaultLocale = document.documentElement.lang || "en_GB"; + const defaultLocale = document.documentElement.language || "en_GB"; const storedLocale = localStorage.getItem("languageCode") || defaultLocale; const dropdownItems = document.querySelectorAll(dropdownClass); diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html index 17e79d57..957bf45f 100644 --- a/src/main/resources/templates/about.html +++ b/src/main/resources/templates/about.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/account.html b/src/main/resources/templates/account.html index 9b7f4df9..4398891d 100644 --- a/src/main/resources/templates/account.html +++ b/src/main/resources/templates/account.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html index 0cf3306d..f5e5e87d 100644 --- a/src/main/resources/templates/addUsers.html +++ b/src/main/resources/templates/addUsers.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/auto-split-pdf.html b/src/main/resources/templates/auto-split-pdf.html index e4d213d8..26106b46 100644 --- a/src/main/resources/templates/auto-split-pdf.html +++ b/src/main/resources/templates/auto-split-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/change-creds.html b/src/main/resources/templates/change-creds.html index 4709e40b..b22a9bd2 100644 --- a/src/main/resources/templates/change-creds.html +++ b/src/main/resources/templates/change-creds.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/book-to-pdf.html b/src/main/resources/templates/convert/book-to-pdf.html index 94229ccf..7d9d436c 100644 --- a/src/main/resources/templates/convert/book-to-pdf.html +++ b/src/main/resources/templates/convert/book-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/file-to-pdf.html b/src/main/resources/templates/convert/file-to-pdf.html index 3949688f..26217b56 100644 --- a/src/main/resources/templates/convert/file-to-pdf.html +++ b/src/main/resources/templates/convert/file-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/html-to-pdf.html b/src/main/resources/templates/convert/html-to-pdf.html index 11184606..c9a26a6b 100644 --- a/src/main/resources/templates/convert/html-to-pdf.html +++ b/src/main/resources/templates/convert/html-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html index 4de9e0f6..6d68fdec 100644 --- a/src/main/resources/templates/convert/img-to-pdf.html +++ b/src/main/resources/templates/convert/img-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/markdown-to-pdf.html b/src/main/resources/templates/convert/markdown-to-pdf.html index d0266aac..8df3ad17 100644 --- a/src/main/resources/templates/convert/markdown-to-pdf.html +++ b/src/main/resources/templates/convert/markdown-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-book.html b/src/main/resources/templates/convert/pdf-to-book.html index e8ef9402..2056c7f5 100644 --- a/src/main/resources/templates/convert/pdf-to-book.html +++ b/src/main/resources/templates/convert/pdf-to-book.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-csv.html b/src/main/resources/templates/convert/pdf-to-csv.html index d21156f0..16da051e 100644 --- a/src/main/resources/templates/convert/pdf-to-csv.html +++ b/src/main/resources/templates/convert/pdf-to-csv.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-html.html b/src/main/resources/templates/convert/pdf-to-html.html index b2347f02..f2e914f9 100644 --- a/src/main/resources/templates/convert/pdf-to-html.html +++ b/src/main/resources/templates/convert/pdf-to-html.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html index 61034578..bcf3e8b3 100644 --- a/src/main/resources/templates/convert/pdf-to-img.html +++ b/src/main/resources/templates/convert/pdf-to-img.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index 1b75a078..866449f1 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-presentation.html b/src/main/resources/templates/convert/pdf-to-presentation.html index f0a4a44a..408ff151 100644 --- a/src/main/resources/templates/convert/pdf-to-presentation.html +++ b/src/main/resources/templates/convert/pdf-to-presentation.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-text.html b/src/main/resources/templates/convert/pdf-to-text.html index cc6b7dcb..d1616589 100644 --- a/src/main/resources/templates/convert/pdf-to-text.html +++ b/src/main/resources/templates/convert/pdf-to-text.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-word.html b/src/main/resources/templates/convert/pdf-to-word.html index 74e6f314..6fd76f4e 100644 --- a/src/main/resources/templates/convert/pdf-to-word.html +++ b/src/main/resources/templates/convert/pdf-to-word.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/pdf-to-xml.html b/src/main/resources/templates/convert/pdf-to-xml.html index 701220c1..a7d020b0 100644 --- a/src/main/resources/templates/convert/pdf-to-xml.html +++ b/src/main/resources/templates/convert/pdf-to-xml.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/convert/url-to-pdf.html b/src/main/resources/templates/convert/url-to-pdf.html index 68044385..94f0bfa5 100644 --- a/src/main/resources/templates/convert/url-to-pdf.html +++ b/src/main/resources/templates/convert/url-to-pdf.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/crop.html b/src/main/resources/templates/crop.html index 825cfbec..05de3516 100644 --- a/src/main/resources/templates/crop.html +++ b/src/main/resources/templates/crop.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index d3cbecb6..954bcd7d 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html index a14e13d2..4bbd8b22 100644 --- a/src/main/resources/templates/extract-page.html +++ b/src/main/resources/templates/extract-page.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/fragments/languages.html b/src/main/resources/templates/fragments/languages.html index f44caef3..07f16cc3 100644 --- a/src/main/resources/templates/fragments/languages.html +++ b/src/main/resources/templates/fragments/languages.html @@ -24,5 +24,5 @@ icon Ελληνικά icon Hungarian icon हिन्दी - icon Srpski + icon Srpski diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index c8ad96b6..4eaa22eb 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -139,7 +139,6 @@
      -
    • icon diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 2d20dc3c..c03283a5 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/licenses.html b/src/main/resources/templates/licenses.html index 8b8858c2..9d7cd250 100644 --- a/src/main/resources/templates/licenses.html +++ b/src/main/resources/templates/licenses.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 049c1740..1a900fd9 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + @@ -52,7 +52,7 @@ document.addEventListener('DOMContentLoaded', function() { - const defaultLocale = document.documentElement.lang || 'en_GB'; + const defaultLocale = document.documentElement.language || 'en_GB'; const storedLocale = localStorage.getItem('languageCode') || defaultLocale; const currentURL = new URL(window.location.href); @@ -113,7 +113,7 @@ if (languageCode) { localStorage.setItem('languageCode', languageCode); - const currentLang = document.documentElement.getAttribute('lang'); + const currentLang = document.documentElement.getAttribute('language'); if (currentLang !== languageCode) { console.log("currentLang", currentLang) console.log("languageCode", languageCode) diff --git a/src/main/resources/templates/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html index 3638391e..33c0cb4f 100644 --- a/src/main/resources/templates/merge-pdfs.html +++ b/src/main/resources/templates/merge-pdfs.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index 1a0f96ee..daa09a1b 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/misc/add-page-numbers.html b/src/main/resources/templates/misc/add-page-numbers.html index bd7104c2..07fc3f9e 100644 --- a/src/main/resources/templates/misc/add-page-numbers.html +++ b/src/main/resources/templates/misc/add-page-numbers.html @@ -1,5 +1,5 @@ - + +

      100%

      + +
      • +
      +
      +

      +
      +
      +
      +
      + + +
      +
      + + - +
      +
      - -
      - + diff --git a/src/main/resources/templates/misc/compare.html b/src/main/resources/templates/misc/compare.html index c225f6b2..3b564855 100644 --- a/src/main/resources/templates/misc/compare.html +++ b/src/main/resources/templates/misc/compare.html @@ -4,11 +4,11 @@ diff --git a/src/main/resources/templates/misc/extract-images.html b/src/main/resources/templates/misc/extract-images.html index b14c9b20..bf79fa54 100644 --- a/src/main/resources/templates/misc/extract-images.html +++ b/src/main/resources/templates/misc/extract-images.html @@ -5,7 +5,7 @@ - +
      diff --git a/src/main/resources/templates/misc/flatten.html b/src/main/resources/templates/misc/flatten.html index 1d4563bc..6107fcc4 100644 --- a/src/main/resources/templates/misc/flatten.html +++ b/src/main/resources/templates/misc/flatten.html @@ -21,26 +21,26 @@ diff --git a/src/main/resources/templates/view-pdf.html b/src/main/resources/templates/view-pdf.html index 8aca4542..afe4e957 100644 --- a/src/main/resources/templates/view-pdf.html +++ b/src/main/resources/templates/view-pdf.html @@ -32,11 +32,11 @@ See https://github.com/adobe-type-tools/cmap-resources - - + + - - + + From 3a62d199794d7a2193630973cd3dad256ea4e29a Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sun, 18 Feb 2024 09:21:30 +0000 Subject: [PATCH 015/200] game const --- src/main/resources/static/js/game.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/js/game.js b/src/main/resources/static/js/game.js index 199bab0f..c98c3a86 100644 --- a/src/main/resources/static/js/game.js +++ b/src/main/resources/static/js/game.js @@ -26,14 +26,22 @@ function initializeGame() { let highScore = localStorage.getItem("highScore") ? parseInt(localStorage.getItem("highScore")) : 0; updateHighScore(); + const BASE_PDF_SPEED = 1; + const LEVEL_INCREASE_PDF_SPEED = 0.2; + const BASE_SPAWN_INTERVAL_MS = 1250; // milliseconds before a new enemy spawns + const LEVEL_INCREASE_FACTOR_MS = 25; // milliseconds to decrease the spawn interval per level + const MAX_SPAWN_RATE_REDUCTION_MS = 800; // Max milliseconds from the base spawn interval + + const keysPressed = {}; const pdfs = []; const projectiles = []; let score = 0; let level = 1; - let pdfSpeed = 0.5; + let pdfSpeed = BASE_PDF_SPEED; let gameOver = false; + function handleKeys() { if (keysPressed["ArrowLeft"]) { playerX -= 10; @@ -188,7 +196,7 @@ function initializeGame() { updateScore(); updateLives(); levelElement.textContent = "Level: " + level; - pdfSpeed = 1; + pdfSpeed = BASE_PDF_SPEED; clearTimeout(spawnPdfTimeout); // Clear the existing spawnPdfTimeout setTimeout(updateGame, 1000 / 60); spawnPdfInterval(); @@ -204,7 +212,7 @@ function initializeGame() { if (newLevel > level) { level = newLevel; levelElement.textContent = "Level: " + level; - pdfSpeed += 0.2; + pdfSpeed += LEVEL_INCREASE_PDF_SPEED; } } @@ -227,9 +235,7 @@ function initializeGame() { let spawnPdfTimeout; - const BASE_SPAWN_INTERVAL_MS = 1250; // milliseconds before a new enemy spawns - const LEVEL_INCREASE_FACTOR_MS = 0; // milliseconds to decrease the spawn interval per level - const MAX_SPAWN_RATE_REDUCTION_MS = 800; // Max milliseconds from the base spawn interval + function spawnPdfInterval() { console.log("spawnPdfInterval"); From 20cb460a7eb13452ff14d5cf0d98a54119773ab1 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sun, 18 Feb 2024 09:45:50 +0000 Subject: [PATCH 016/200] controls and sizing bounds --- src/main/resources/static/js/game.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/resources/static/js/game.js b/src/main/resources/static/js/game.js index c98c3a86..6ddc392e 100644 --- a/src/main/resources/static/js/game.js +++ b/src/main/resources/static/js/game.js @@ -26,6 +26,7 @@ function initializeGame() { let highScore = localStorage.getItem("highScore") ? parseInt(localStorage.getItem("highScore")) : 0; updateHighScore(); + const PLAYER_MOVE_SPEED = 5; const BASE_PDF_SPEED = 1; const LEVEL_INCREASE_PDF_SPEED = 0.2; const BASE_SPAWN_INTERVAL_MS = 1250; // milliseconds before a new enemy spawns @@ -33,7 +34,7 @@ function initializeGame() { const MAX_SPAWN_RATE_REDUCTION_MS = 800; // Max milliseconds from the base spawn interval - const keysPressed = {}; + let keysPressed = {}; const pdfs = []; const projectiles = []; let score = 0; @@ -44,10 +45,12 @@ function initializeGame() { function handleKeys() { if (keysPressed["ArrowLeft"]) { - playerX -= 10; + playerX -= PLAYER_MOVE_SPEED; + playerX = Math.max(0, playerX) } if (keysPressed["ArrowRight"]) { - playerX += 10; + playerX += PLAYER_MOVE_SPEED; + playerX = Math.min(gameContainer.clientWidth - playerSize, playerX); } if (keysPressed[" "] && !gameOver) { const currentTime = new Date().getTime(); @@ -59,17 +62,21 @@ function initializeGame() { updatePlayerPosition(); } - document.addEventListener("keydown", (event) => { + function onKeydown(event) { if (event.key === " ") { event.preventDefault(); } keysPressed[event.key] = true; handleKeys(); - }); - - document.addEventListener("keyup", (event) => { - keysPressed[event.key] = false; - }); + } + function onKeyUp(event) { + keysPressed[event.key] = false; + } + + document.removeEventListener("keydown", onKeydown); + document.removeEventListener("keyup", onKeyUp); + document.addEventListener("keydown", onKeydown); + document.addEventListener("keyup", onKeyUp); function updatePlayerPosition() { player.style.left = playerX + "px"; @@ -102,7 +109,7 @@ function initializeGame() { pdf.classList.add("pdf"); pdf.style.width = pdfSize + "px"; pdf.style.height = pdfSize + "px"; - pdf.style.left = Math.floor(Math.random() * (gameContainer.clientWidth - pdfSize)) + "px"; + pdf.style.left = Math.floor(Math.random() * (gameContainer.clientWidth - (2*pdfSize))) + pdfSize + "px"; pdf.style.top = "0px"; gameContainer.appendChild(pdf); pdfs.push(pdf); @@ -116,6 +123,7 @@ function initializeGame() { function updateGame() { if (gameOver || paused) return; + handleKeys(); for (let pdfIndex = 0; pdfIndex < pdfs.length; pdfIndex++) { const pdf = pdfs[pdfIndex]; const pdfY = parseFloat(pdf.style.top) + pdfSpeed; From c96ebccae46a8c367f42754c13541ba96eb6011f Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sun, 18 Feb 2024 13:30:56 +0000 Subject: [PATCH 017/200] Download message for game --- src/main/resources/messages_ar_AR.properties | 3 ++- src/main/resources/messages_bg_BG.properties | 3 ++- src/main/resources/messages_ca_CA.properties | 3 ++- src/main/resources/messages_de_DE.properties | 3 ++- src/main/resources/messages_el_GR.properties | 3 ++- src/main/resources/messages_en_GB.properties | 3 ++- src/main/resources/messages_en_US.properties | 3 ++- src/main/resources/messages_es_ES.properties | 3 ++- src/main/resources/messages_eu_ES.properties | 3 ++- src/main/resources/messages_fr_FR.properties | 5 +++-- src/main/resources/messages_hi_IN.properties | 3 ++- src/main/resources/messages_hu_HU.properties | 3 ++- src/main/resources/messages_id_ID.properties | 3 ++- src/main/resources/messages_it_IT.properties | 3 ++- src/main/resources/messages_ja_JP.properties | 4 +++- src/main/resources/messages_ko_KR.properties | 3 ++- src/main/resources/messages_nl_NL.properties | 3 ++- src/main/resources/messages_pl_PL.properties | 3 ++- src/main/resources/messages_pt_BR.properties | 3 ++- src/main/resources/messages_ro_RO.properties | 3 ++- src/main/resources/messages_ru_RU.properties | 3 ++- .../resources/messages_sr_LATN_RS.properties | 3 ++- src/main/resources/messages_sv_SE.properties | 3 ++- src/main/resources/messages_tr_TR.properties | 3 ++- src/main/resources/messages_zh_CN.properties | 3 ++- src/main/resources/messages_zh_TW.properties | 3 ++- src/main/resources/static/js/downloader.js | 18 ++++++++++++++++++ src/main/resources/static/js/game.js | 3 --- .../resources/templates/fragments/common.html | 7 +++++-- 29 files changed, 77 insertions(+), 32 deletions(-) diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index bdd14ecd..f2a2a75d 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=\u062D\u0641\u0638 close=\u0625\u063A\u0644\u0627\u0642 filesSelected=الملفات المحددة noFavourites=لم تتم إضافة أي مفضلات +downloadComplete=Download Complete bored=الانتظار بالملل؟ alphabet=\u0627\u0644\u0623\u0628\u062C\u062F\u064A\u0629 downloadPdf=تنزيل PDF diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 9bef411d..9fbee0f4 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Съхранете close=Затворете filesSelected=избрани файлове noFavourites=Няма добавени любими +downloadComplete=Download Complete bored=Отекчени сте да чакате? alphabet=Азбука downloadPdf=Изтеглете PDF diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index e47451b6..0cac1ef3 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Desa close=Tanca filesSelected=fitxers seleccionats noFavourites=No s'ha afegit cap favorit +downloadComplete=Download Complete bored=Avorrit esperant? alphabet=Alfabet downloadPdf=Descarregueu PDF diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 2f043a7c..badb132f 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Speichern close=Schließen filesSelected=Dateien ausgewählt noFavourites=Keine Favoriten hinzugefügt +downloadComplete=Download Complete bored=Langeweile beim Warten? alphabet=Alphabet downloadPdf=PDF herunterladen diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index fa3c4b65..ae4993a9 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7 close=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF filesSelected=\u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03C0\u03BF\u03C5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03C7\u03B8\u03B7\u03BA\u03B1\u03BD noFavourites=\u039A\u03B1\u03BD\u03AD\u03BD\u03B1 \u03B1\u03B3\u03B1\u03C0\u03AE\u03BC\u03B5\u03BD\u03BF \u03B4\u03B5\u03BD \u03AD\u03C7\u03B5\u03B9 \u03C0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03B5\u03AF +downloadComplete=Download Complete bored=\u0392\u03B1\u03C1\u03B9\u03AD\u03C3\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03B5\u03C1\u03B9\u03BC\u03AD\u03BD\u03B5\u03C4\u03B5; alphabet=\u0391\u03BB\u03C6\u03AC\u03B2\u03B7\u03C4\u03BF downloadPdf=\u039A\u03B1\u03C4\u03AD\u03B2\u03B1\u03C3\u03BC\u03B1 \u03C4\u03BF\u03C5 PDF diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 1dd5262d..5d8a4dbc 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr = left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Save close=Close filesSelected=files selected noFavourites=No favourites added +downloadComplete=Download Complete bored=Bored Waiting? alphabet=Alphabet downloadPdf=Download PDF diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 120ace75..2948fa20 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Save close=Close filesSelected=files selected noFavourites=No favorites added +downloadComplete=Download Complete bored=Bored Waiting? alphabet=Alphabet downloadPdf=Download PDF diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 38c6d6a5..8e28ef35 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Guardar close=Cerrar filesSelected=archivos seleccionados noFavourites=No se agregaron favoritos +downloadComplete=Download Complete bored=¿Cansado de esperar? alphabet=Alfabeto downloadPdf=Descargar PDF diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 21767b94..9267379f 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Gorde close=Itxi filesSelected=Hautatutako fitxategiak noFavourites=Ez dira gogokoak gehitu +downloadComplete=Download Complete bored=Itxaroten aspertuta? alphabet=Alfabetoa downloadPdf=PDFa deskargatu diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index e40d9291..58ee579d 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -20,6 +20,7 @@ save=Enregistrer close=Fermer filesSelected=fichiers sélectionnés noFavourites=Aucun favori ajouté +downloadComplete=Téléchargement terminé bored=Ennuyé d\u2019attendre\u00a0? alphabet=Alphabet downloadPdf=Télécharger le PDF @@ -925,7 +926,6 @@ PDFToCSV.prompt=Choisir la page pour en extraire le tableau PDFToCSV.submit=Extrait #split-by-size-or-count -split-by-size-or-count.title=Séparer le PDF par taille ou par nombre split-by-size-or-count.header=Séparer le PDF par taille ou par nombre split-by-size-or-count.type.label=Sélectionner le type de division split-by-size-or-count.type.size=Par taille @@ -937,7 +937,6 @@ split-by-size-or-count.submit=Séparer #overlay-pdfs -overlay-pdfs.title=Incrustation de PDF overlay-pdfs.header=Incrustation de PDF overlay-pdfs.baseFile.label=Sélectionner le fichier PDF de base overlay-pdfs.overlayFiles.label=Sélectionner les fichiers PDF à superposer @@ -970,3 +969,5 @@ licenses.header=Licences tierces licenses.module=Module licenses.version=Version licenses.license=Licence + + diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index b17af690..1033b65a 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=सहेजें close=बंद करें filesSelected=फ़ाइलें चयनित हैं noFavourites=कोई पसंदीदा जोड़ा नहीं गया है +downloadComplete=Download Complete bored=बोर हो रहे हैं? alphabet=वर्णमाला downloadPdf=पीडीएफ़ डाउनलोड करें diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 0fab7e30..b82e1d64 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Mentés close=Bezárás filesSelected=kiválasztott fájlok noFavourites=Nincs hozzáadva kedvenc +downloadComplete=Download Complete bored=Unatkozol? alphabet=Ábécé downloadPdf=PDF letöltése diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index 4bbe247b..e3c1cec7 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl=right to left) @@ -20,6 +20,7 @@ save=Simpan close=Tutup filesSelected=berkas dipilih noFavourites=Tidak ada favorit yang ditambahkan +downloadComplete=Download Complete bored=Bosan Menunggu? alphabet=Abjad downloadPdf=Unduh PDF diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 4557da8d..871b28a7 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Salva close=Chiudi filesSelected=file selezionati noFavourites=Nessun preferito +downloadComplete=Download Complete bored=Stanco di aspettare? alphabet=Alfabeto downloadPdf=Scarica PDF diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index fb794c81..46740e68 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=保存 close=閉じる filesSelected=選択されたファイル noFavourites=お気に入りはありません +downloadComplete=Download Complete bored=待ち時間が退屈 alphabet=\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8 downloadPdf=PDFをダウンロード @@ -969,3 +970,4 @@ licenses.module=モジュール licenses.version=バージョン licenses.license=ライセンス + diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index a016e6b3..e710eccf 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=저장 close=닫기 filesSelected=개 파일 선택됨 noFavourites=즐겨찾기 없음 +downloadComplete=Download Complete bored=기다리는 게 지루하신가요? alphabet=\uC54C\uD30C\uBCB3 downloadPdf=PDF 다운로드 diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index fed34234..d261f5a1 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Opslaan close=Sluiten filesSelected=Bestanden geselecteerd noFavourites=Geen favorieten toegevoegd +downloadComplete=Download Complete bored=Verveeld met wachten? alphabet=Alfabet downloadPdf=Download PDF diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index c385a13f..14a4f979 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Zapisz close=Zamknij filesSelected=wybrane pliki noFavourites=Nie dodano ulubionych +downloadComplete=Download Complete bored=Znudzony czekaniem? alphabet=Alfabet downloadPdf=Pobierz PDF diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index 778f1df5..d7115da7 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Salvar close=Fechar filesSelected=arquivos selecionados noFavourites=Nenhum favorito adicionado +downloadComplete=Download Complete bored=Entediado esperando? alphabet=Alfabeto downloadPdf=baixar PDF diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 4e34c6e3..4c3712e9 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Salvează close=Închide filesSelected=fișiere selectate noFavourites=Niciun favorit adăugat +downloadComplete=Download Complete bored=Plictisit așteptând? alphabet=Alfabet downloadPdf=Descarcă PDF diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index d386167b..14971b97 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Сохранить close=Закрыть filesSelected=файлов выбрано noFavourites=Нет избранного +downloadComplete=Download Complete bored=Скучно ждать? alphabet=Алфавит downloadPdf=Скачать PDF diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 1cd0eec3..7c4446f7 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Sačuvaj close=Zatvori filesSelected=odabrani fajlovi noFavourites=Nema dodatih favorita +downloadComplete=Download Complete bored=Da li ti je dosadno dok čekaš? alphabet=Alfabet downloadPdf=Skini PDF diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index 5908b41c..e2199e00 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Spara close=Stäng filesSelected=filer valda noFavourites=Inga favoriter har lagts till +downloadComplete=Download Complete bored=Utråkad att vänta? alphabet=Alfabet downloadPdf=Ladda ner PDF diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 618e967e..0dd60789 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=Kaydet close=Kapat filesSelected=dosya seçildi noFavourites=Favori eklenmedi +downloadComplete=Download Complete bored=Sıkıldınız mı? alphabet=Alfabe downloadPdf=PDF İndir diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index ea994fbb..c79eb73c 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=保存 close=关闭 filesSelected=选中的文件 noFavourites=没有添加收藏夹 +downloadComplete=Download Complete bored=无聊等待吗？ alphabet=字母表 downloadPdf=下载PDF diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 2122d9f0..fa0e2d35 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -1,4 +1,4 @@ -########### +########### # Generic # ########### # the direction that the language is written (ltr=left to right, rtl = right to left) @@ -20,6 +20,7 @@ save=儲存 close=關閉 filesSelected=已選擇的檔案 noFavourites=未新增收藏 +downloadComplete=Download Complete bored=等待時覺得無聊？ alphabet=字母表 downloadPdf=下載 PDF diff --git a/src/main/resources/static/js/downloader.js b/src/main/resources/static/js/downloader.js index 9871b69d..4d7fa783 100644 --- a/src/main/resources/static/js/downloader.js +++ b/src/main/resources/static/js/downloader.js @@ -45,6 +45,24 @@ $(document).ready(function () { } clearTimeout(timeoutId); $("#submitBtn").text(originalButtonText); + + // After process finishes, check for boredWaiting and gameDialog open status + const boredWaiting = localStorage.getItem("boredWaiting") || "disabled"; + const gameDialog = document.getElementById('game-container-wrapper'); + if (boredWaiting === "enabled" && gameDialog && gameDialog.open) { + // Display a green banner at the bottom of the screen saying "Download complete" + let downloadCompleteText = "Download Complete"; + if(window.downloadCompleteText){ + downloadCompleteText = window.downloadCompleteText; + } + $("body").append('
      '+ downloadCompleteText + '
      '); + setTimeout(function() { + $("#download-complete-banner").fadeOut("slow", function() { + $(this).remove(); // Remove the banner after fading out + }); + }, 5000); // Banner will fade out after 5 seconds + } + } catch (error) { clearTimeout(timeoutId); handleDownloadError(error); diff --git a/src/main/resources/static/js/game.js b/src/main/resources/static/js/game.js index 6ddc392e..c5162127 100644 --- a/src/main/resources/static/js/game.js +++ b/src/main/resources/static/js/game.js @@ -246,13 +246,10 @@ function initializeGame() { function spawnPdfInterval() { - console.log("spawnPdfInterval"); if (gameOver || paused) { - console.log("spawnPdfInterval 2"); clearTimeout(spawnPdfTimeout); return; } - console.log("spawnPdfInterval 3"); spawnPdf(); let spawnRateReduction = Math.min(level * LEVEL_INCREASE_FACTOR_MS, MAX_SPAWN_RATE_REDUCTION_MS); let spawnRate = BASE_SPAWN_INTERVAL_MS - spawnRateReduction; diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index 517a902b..2bd60360 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -67,7 +67,7 @@ - -
      +

      Sync browser settings with Account

      @@ -199,7 +197,7 @@ - + @@ -271,13 +269,9 @@ }); -
      - - - - - - +
      + Sign Out + Admin Settings
      @@ -286,4 +280,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html index 397b054a..850beb9e 100644 --- a/src/main/resources/templates/addUsers.html +++ b/src/main/resources/templates/addUsers.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -25,7 +25,7 @@ Username Roles - Actions + Actions @@ -76,4 +76,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/auto-split-pdf.html b/src/main/resources/templates/auto-split-pdf.html index 26106b46..914b9d60 100644 --- a/src/main/resources/templates/auto-split-pdf.html +++ b/src/main/resources/templates/auto-split-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -29,8 +29,8 @@
      -

      -

      +

      +

      diff --git a/src/main/resources/templates/change-creds.html b/src/main/resources/templates/change-creds.html index aab874e2..08a3ade7 100644 --- a/src/main/resources/templates/change-creds.html +++ b/src/main/resources/templates/change-creds.html @@ -1,5 +1,5 @@ - + @@ -9,14 +9,14 @@
      -

      +

      User Settings

      -
      +
      Default message if not found @@ -35,7 +35,6 @@

      User!

      -

      Change password

      @@ -76,4 +75,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/book-to-pdf.html b/src/main/resources/templates/convert/book-to-pdf.html index d614af0d..acd40b21 100644 --- a/src/main/resources/templates/convert/book-to-pdf.html +++ b/src/main/resources/templates/convert/book-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,14 +9,14 @@
      -

      +

      -
      - +
      +

      @@ -26,4 +26,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/file-to-pdf.html b/src/main/resources/templates/convert/file-to-pdf.html index c0553c26..d8c8b969 100644 --- a/src/main/resources/templates/convert/file-to-pdf.html +++ b/src/main/resources/templates/convert/file-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,31 +9,30 @@
      -

      +

      -

      -

      -
      -
      -
      - -
      -

      -

      -

      Microsoft Word: (DOC, DOCX, DOT, DOTX)

      -

      Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF)

      -

      Microsoft PowerPoint: (PPT, PPTX)

      -

      OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG)

      -

      Plain Text: (TXT, TEXT, XML)

      -

      Rich Text Format: (RTF)

      -

      Images: (BMP, GIF, JPEG, PNG, TIF, PBM, PGM, PPM, RAS, XBM, XPM, SVG, SVM, WMF)

      -

      HTML: (HTML)

      -

      Lotus Word Pro: (LWP)

      -

      StarOffice: (SDA, SDC, SDD, SDW, STC, STD, STI, STW, SXD, SXG, SXI, SXW)

      -

      Other: (DBF, FODS, VSD, VOR, VOR3, VOR4, UOP, PCT, PS, PDF)

      - https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html +

      +

      +
      +
      + +
      +

      +

      +

      Microsoft Word: (DOC, DOCX, DOT, DOTX)

      +

      Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF)

      +

      Microsoft PowerPoint: (PPT, PPTX)

      +

      OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG)

      +

      Plain Text: (TXT, TEXT, XML)

      +

      Rich Text Format: (RTF)

      +

      Images: (BMP, GIF, JPEG, PNG, TIF, PBM, PGM, PPM, RAS, XBM, XPM, SVG, SVM, WMF)

      +

      HTML: (HTML)

      +

      Lotus Word Pro: (LWP)

      +

      StarOffice: (SDA, SDC, SDD, SDW, STC, STD, STI, STW, SXD, SXG, SXI, SXW)

      +

      Other: (DBF, FODS, VSD, VOR, VOR3, VOR4, UOP, PCT, PS, PDF)

      + https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html
      diff --git a/src/main/resources/templates/convert/html-to-pdf.html b/src/main/resources/templates/convert/html-to-pdf.html index c9a26a6b..3c426917 100644 --- a/src/main/resources/templates/convert/html-to-pdf.html +++ b/src/main/resources/templates/convert/html-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,16 +9,16 @@
      -

      +

      -
      +
      - +

      @@ -32,4 +32,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html index 6d68fdec..a8633ad1 100644 --- a/src/main/resources/templates/convert/img-to-pdf.html +++ b/src/main/resources/templates/convert/img-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -46,7 +46,7 @@
      -

      +

      @@ -79,4 +79,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/markdown-to-pdf.html b/src/main/resources/templates/convert/markdown-to-pdf.html index 8df3ad17..7a51a29c 100644 --- a/src/main/resources/templates/convert/markdown-to-pdf.html +++ b/src/main/resources/templates/convert/markdown-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,14 +9,13 @@
      -

      +

      -

      @@ -28,4 +27,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-book.html b/src/main/resources/templates/convert/pdf-to-book.html index db9b4692..33fbd2e1 100644 --- a/src/main/resources/templates/convert/pdf-to-book.html +++ b/src/main/resources/templates/convert/pdf-to-book.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -42,4 +42,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-csv.html b/src/main/resources/templates/convert/pdf-to-csv.html index 16da051e..9fba9430 100644 --- a/src/main/resources/templates/convert/pdf-to-csv.html +++ b/src/main/resources/templates/convert/pdf-to-csv.html @@ -1,5 +1,5 @@ - + @@ -8,13 +8,13 @@
      -

      +

      - +
      @@ -23,8 +23,8 @@
      @@ -106,9 +106,9 @@ let typedArray = new Uint8Array(reader.result); pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdfjs/pdf.worker.js'; pdfjsLib.getDocument(typedArray).promise.then(function(pdf) { - pdfDoc = pdf; - totalPages = pdf.numPages; - renderPage(currentPage); + pdfDoc = pdf; + totalPages = pdf.numPages; + renderPage(currentPage); }); pageId.value = currentPage; }; @@ -140,4 +140,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-html.html b/src/main/resources/templates/convert/pdf-to-html.html index f2e914f9..c9256805 100644 --- a/src/main/resources/templates/convert/pdf-to-html.html +++ b/src/main/resources/templates/convert/pdf-to-html.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -27,4 +27,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html index bcf3e8b3..039c52e0 100644 --- a/src/main/resources/templates/convert/pdf-to-img.html +++ b/src/main/resources/templates/convert/pdf-to-img.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -55,4 +55,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index 866449f1..e9b8ac88 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      diff --git a/src/main/resources/templates/convert/pdf-to-presentation.html b/src/main/resources/templates/convert/pdf-to-presentation.html index 408ff151..48d27d24 100644 --- a/src/main/resources/templates/convert/pdf-to-presentation.html +++ b/src/main/resources/templates/convert/pdf-to-presentation.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -35,4 +35,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-text.html b/src/main/resources/templates/convert/pdf-to-text.html index d1616589..9877be8f 100644 --- a/src/main/resources/templates/convert/pdf-to-text.html +++ b/src/main/resources/templates/convert/pdf-to-text.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -34,5 +34,4 @@
      - - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-word.html b/src/main/resources/templates/convert/pdf-to-word.html index 6fd76f4e..fbbbf45d 100644 --- a/src/main/resources/templates/convert/pdf-to-word.html +++ b/src/main/resources/templates/convert/pdf-to-word.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -35,7 +35,4 @@
      - - - - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-xml.html b/src/main/resources/templates/convert/pdf-to-xml.html index a7d020b0..cad43da2 100644 --- a/src/main/resources/templates/convert/pdf-to-xml.html +++ b/src/main/resources/templates/convert/pdf-to-xml.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -27,4 +27,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/convert/url-to-pdf.html b/src/main/resources/templates/convert/url-to-pdf.html index 94f0bfa5..714bd1c4 100644 --- a/src/main/resources/templates/convert/url-to-pdf.html +++ b/src/main/resources/templates/convert/url-to-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,13 +9,13 @@
      -

      +

      - +
      @@ -27,4 +27,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/crop.html b/src/main/resources/templates/crop.html index 05de3516..f2049572 100644 --- a/src/main/resources/templates/crop.html +++ b/src/main/resources/templates/crop.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -22,114 +22,117 @@
      - - -
      - + + overlayCanvas.addEventListener('mousedown', function(e) { + // Clear previously drawn rectangle on the main canvas + context.clearRect(0, 0, pdfCanvas.width, pdfCanvas.height); + renderPage(currentPage); // Re-render the PDF + + // Clear the overlay canvas to ensure old drawings are removed + overlayContext.clearRect(0, 0, overlayCanvas.width, overlayCanvas.height); + + startX = e.offsetX; + startY = e.offsetY; + isDrawing = true; + }); + + overlayCanvas.addEventListener('mousemove', function(e) { + if (!isDrawing) return; + overlayContext.clearRect(0, 0, overlayCanvas.width, overlayCanvas.height); // Clear previous rectangle + + rectWidth = e.offsetX - startX; + rectHeight = e.offsetY - startY; + overlayContext.strokeStyle = 'red'; + overlayContext.strokeRect(startX, startY, rectWidth, rectHeight); + }); + + overlayCanvas.addEventListener('mouseup', function(e) { + isDrawing = false; + + rectWidth = e.offsetX - startX; + rectHeight = e.offsetY - startY; + + let flippedY = pdfCanvas.height - e.offsetY; + + xInput.value = startX; + yInput.value = flippedY; + widthInput.value = rectWidth; + heightInput.value = rectHeight; + + // Draw the final rectangle on the main canvas + context.strokeStyle = 'red'; + context.strokeRect(startX, startY, rectWidth, rectHeight); + + overlayContext.clearRect(0, 0, overlayCanvas.width, overlayCanvas.height); // Clear the overlay + }); + + function renderPage(pageNumber) { + pdfDoc.getPage(pageNumber).then(function(page) { + let viewport = page.getViewport({ scale: 1.0 }); + pdfCanvas.width = viewport.width; + pdfCanvas.height = viewport.height; + + overlayCanvas.width = viewport.width; // Match overlay canvas size with PDF canvas + overlayCanvas.height = viewport.height; + + let renderContext = { canvasContext: context, viewport: viewport }; + page.render(renderContext); + pdfCanvas.classList.add("shadow-canvas"); + }); + } + +
      - + \ No newline at end of file diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 954bcd7d..57f2f4ad 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + @@ -29,11 +29,11 @@ Submit a ticket on GitHub Join our Discord server
      - Go back to homepage + Go back to homepage
      - + \ No newline at end of file diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html index 4bbd8b22..c10485b8 100644 --- a/src/main/resources/templates/extract-page.html +++ b/src/main/resources/templates/extract-page.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      diff --git a/src/main/resources/templates/fragments/card.html b/src/main/resources/templates/fragments/card.html index 6fa05163..3f5517d6 100644 --- a/src/main/resources/templates/fragments/card.html +++ b/src/main/resources/templates/fragments/card.html @@ -1,7 +1,7 @@
      - Icon + Icon

      diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index 2bd60360..98bf27e9 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -3,8 +3,8 @@ - - + + @@ -43,7 +43,7 @@ - + @@ -84,7 +84,7 @@ const downloadCompleteText = /*[[#{downloadComplete}]]*/ 'Download Complete'; window.downloadCompleteText = downloadCompleteText; // Create the 'show-game-btn' button - var gameButton = $('

      '); + var gameButton = $('

      '); // Insert the 'show-game-btn' just above the submit button submitButton.before(gameButton); @@ -130,38 +130,33 @@
      Score: 0
      High Score: 0
      Level: 1
      - + favicon
      - - - + + -
      -
      - +
      +
      + +
      +
      -
      -
      -
      diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index e382553b..3d32604d 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,19 +1,19 @@ diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index f7d01c0e..926f494d 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -31,11 +31,11 @@
    • - -
      +
      @@ -58,11 +58,11 @@
    • - -
      +
      @@ -86,10 +86,10 @@
    • - -
      +
      @@ -103,11 +103,11 @@
    • - -
      +
      @@ -132,22 +132,22 @@
      -
      • +
      \ No newline at end of file diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 8ddb7dea..ed1c6a18 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + @@ -21,7 +21,7 @@

      - +
      @@ -75,7 +75,6 @@
      -
      @@ -102,4 +101,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/licenses.html b/src/main/resources/templates/licenses.html index 9d7cd250..f9d6c641 100644 --- a/src/main/resources/templates/licenses.html +++ b/src/main/resources/templates/licenses.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -23,15 +23,12 @@ - + - + -
      @@ -39,4 +36,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 19a4b728..02c9cfed 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + @@ -52,7 +52,7 @@ document.addEventListener('DOMContentLoaded', function() { - const defaultLocale = document.documentElement.language || 'en_GB'; + const defaultLocale = document.documentElement.getAttribute('language') || 'en_GB'; const storedLocale = localStorage.getItem('languageCode') || defaultLocale; const currentURL = new URL(window.location.href); @@ -61,10 +61,10 @@ if (defaultLocale !== storedLocale && currentLangParam !== storedLocale) { - urlParams.set('lang', storedLocale); - currentURL.search = urlParams.toString(); - window.location.href = currentURL.toString(); - return; + urlParams.set('lang', storedLocale); + currentURL.search = urlParams.toString(); + window.location.href = currentURL.toString(); + return; } const dropdown = document.getElementById('languageDropdown'); @@ -72,17 +72,17 @@ let activeItem; for (let i = 0; i < dropdownItems.length; i++) { - const item = dropdownItems[i]; - item.classList.remove('active'); - if (item.dataset.bsLanguageCode === storedLocale) { - item.classList.add('active'); - activeItem = item; - } - item.addEventListener('click', handleDropdownItemClick); + const item = dropdownItems[i]; + item.classList.remove('active'); + if (item.dataset.bsLanguageCode === storedLocale) { + item.classList.add('active'); + activeItem = item; + } + item.addEventListener('click', handleDropdownItemClick); } if (activeItem) { - dropdown.innerHTML = activeItem.innerHTML; // This will set the dropdown button's content to the active language's flag and name + dropdown.innerHTML = activeItem.innerHTML; // This will set the dropdown button's content to the active language's flag and name } // Additional functionality that was in your provided code: @@ -91,7 +91,7 @@ const dropdownMenu = element.querySelector(".dropdown-menu"); if (dropdownMenu.id !== 'favoritesDropdown' && dropdownMenu.children.length <= 2 && dropdownMenu.querySelectorAll("hr.dropdown-divider").length === dropdownMenu.children.length) { if (element.previousElementSibling && element.previousElementSibling.classList.contains('nav-item') && element.previousElementSibling.classList.contains('nav-item-separator')) { - element.previousElementSibling.remove(); + element.previousElementSibling.remove(); } element.remove(); } @@ -142,23 +142,25 @@

      Please sign in

      - + +
      - + +
      - + +
      @@ -174,4 +176,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html index 33c0cb4f..10a0bb06 100644 --- a/src/main/resources/templates/merge-pdfs.html +++ b/src/main/resources/templates/merge-pdfs.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -36,4 +36,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index daa09a1b..04e0dfc5 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@
      -

      +

      @@ -66,42 +66,41 @@
      -
      - - - -
      +
      + + +
      - - -
      - -
      -
      + + +
      + +
      +
      @@ -109,4 +108,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/misc/add-page-numbers.html b/src/main/resources/templates/misc/add-page-numbers.html index 07fc3f9e..0d02d456 100644 --- a/src/main/resources/templates/misc/add-page-numbers.html +++ b/src/main/resources/templates/misc/add-page-numbers.html @@ -1,12 +1,12 @@ - +
      -

      +

      -

      -
      +
      - @@ -9,7 +19,7 @@
      -

      +

      @@ -33,7 +43,7 @@
      - +
      1
      2
      @@ -47,11 +57,11 @@
      - +
      - @@ -70,11 +80,11 @@
      @@ -164,4 +174,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/multi-page-layout.html b/src/main/resources/templates/multi-page-layout.html index ed143e42..0e51b8fa 100644 --- a/src/main/resources/templates/multi-page-layout.html +++ b/src/main/resources/templates/multi-page-layout.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -17,12 +17,12 @@
      - + + + + +
      diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html index b9cc3841..cb398a61 100644 --- a/src/main/resources/templates/multi-tool.html +++ b/src/main/resources/templates/multi-tool.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -28,13 +28,13 @@
      -
      +
      - - + +
      -
      +
      +
      -
      - + \ No newline at end of file diff --git a/src/main/resources/templates/overlay-pdf.html b/src/main/resources/templates/overlay-pdf.html index 5d482466..10cd43d9 100644 --- a/src/main/resources/templates/overlay-pdf.html +++ b/src/main/resources/templates/overlay-pdf.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@
      -

      +

      @@ -20,9 +20,9 @@
      @@ -75,7 +75,7 @@ var fileInput = document.getElementById('overlayFiles-input'); console.log("fileInput2",fileInput); if (fileInput) { - fileInput.addEventListener('change', updateCountsInputs); + fileInput.addEventListener('change', updateCountsInputs); } }); document.addEventListener('DOMContentLoaded', (event) => { @@ -93,4 +93,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html index 94362f55..9f69c95c 100644 --- a/src/main/resources/templates/pdf-organizer.html +++ b/src/main/resources/templates/pdf-organizer.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -19,15 +19,15 @@
      @@ -53,4 +53,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/pdf-to-single-page.html b/src/main/resources/templates/pdf-to-single-page.html index 1cf5bc69..0dc8761c 100644 --- a/src/main/resources/templates/pdf-to-single-page.html +++ b/src/main/resources/templates/pdf-to-single-page.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html index 6dcab369..04887c0c 100644 --- a/src/main/resources/templates/pipeline.html +++ b/src/main/resources/templates/pipeline.html @@ -1,5 +1,5 @@ - + @@ -12,16 +12,15 @@
      -

      +

      - -
      -

      - icon -
      - - + +
      +

      + icon +
      +
      @@ -44,8 +43,8 @@
      Pipeline Help -
      - Folder Scanning Help +
      + Folder Scanning Help
      @@ -87,7 +86,7 @@
      - + @@ -105,4 +104,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html index c67f7658..9e8a8bc5 100644 --- a/src/main/resources/templates/remove-pages.html +++ b/src/main/resources/templates/remove-pages.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -17,7 +17,7 @@
      - +
      diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html index c9ef7c6b..5446ff92 100644 --- a/src/main/resources/templates/rotate-pdf.html +++ b/src/main/resources/templates/rotate-pdf.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -19,25 +19,25 @@
      @@ -49,7 +49,8 @@ - - - + + \ No newline at end of file diff --git a/src/main/resources/templates/scale-pages.html b/src/main/resources/templates/scale-pages.html index 163e0de8..ede08025 100644 --- a/src/main/resources/templates/scale-pages.html +++ b/src/main/resources/templates/scale-pages.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -17,21 +17,21 @@
      - + + + + + + + + +
      - +
      diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html index bb020d75..015cee5c 100644 --- a/src/main/resources/templates/security/add-password.html +++ b/src/main/resources/templates/security/add-password.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -82,4 +82,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html index b7fdc949..1195f2c4 100644 --- a/src/main/resources/templates/security/add-watermark.html +++ b/src/main/resources/templates/security/add-watermark.html @@ -1,5 +1,5 @@ - + @@ -8,130 +8,130 @@
      -

      +

      -

      +

      -
      -
      - -
      - -
      -
      + +
      + +
      + +
      +
      -
      - - -
      -
      - - -
      -
      - - -
      +
      + + +
      +
      + + +
      +
      + + +
      - - -
      - - -
      -
      - - - -
      - - -
      - - -
      -
      - - -
      -
      - - -
      -
      - -
      -
      + +
      + + +
      +
      + + + +
      + +
      + + +
      +
      + + +
      +
      + + +
      +
      + +
      + + +
      @@ -139,4 +139,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/security/auto-redact.html b/src/main/resources/templates/security/auto-redact.html index bd927964..d13fcb88 100644 --- a/src/main/resources/templates/security/auto-redact.html +++ b/src/main/resources/templates/security/auto-redact.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -52,23 +52,23 @@ }
      - - + +
      - - + +
      - - + +
      - - + +
      @@ -80,4 +80,4 @@
      - + \ No newline at end of file diff --git a/src/main/resources/templates/security/cert-sign.html b/src/main/resources/templates/security/cert-sign.html index c4a34463..0f369c27 100644 --- a/src/main/resources/templates/security/cert-sign.html +++ b/src/main/resources/templates/security/cert-sign.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -23,7 +23,8 @@
      - @@ -49,10 +50,12 @@
      - + +
      - + +
      - -
      - - -
      + // Event listeners + document.getElementById('horizontalDivisions').addEventListener('input', updateVisualAid); + document.getElementById('verticalDivisions').addEventListener('input', updateVisualAid); + + // Initial draw + updateVisualAid(); + +
      + +
      diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html index ce87d5f7..7ed934dd 100644 --- a/src/main/resources/templates/split-pdfs.html +++ b/src/main/resources/templates/split-pdfs.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@
      -

      +

      @@ -26,7 +26,7 @@
      - +

      @@ -39,4 +39,4 @@
      - + \ No newline at end of file From a800766cb8e783fb589dcc64507d5b9e8de61a54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:08:00 +0000 Subject: [PATCH 073/200] Bump org.commonmark:commonmark from 0.21.0 to 0.22.0 (#957) Bumps [org.commonmark:commonmark](https://github.com/commonmark/commonmark-java) from 0.21.0 to 0.22.0. - [Release notes](https://github.com/commonmark/commonmark-java/releases) - [Changelog](https://github.com/commonmark/commonmark-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/commonmark/commonmark-java/compare/commonmark-parent-0.21.0...commonmark-parent-0.22.0) --- updated-dependencies: - dependency-name: org.commonmark:commonmark dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index da2c83d3..be44e4dc 100644 --- a/build.gradle +++ b/build.gradle @@ -151,8 +151,8 @@ dependencies { implementation 'io.micrometer:micrometer-core:1.12.4' implementation group: 'com.google.zxing', name: 'core', version: '3.5.3' // https://mvnrepository.com/artifact/org.commonmark/commonmark - implementation 'org.commonmark:commonmark:0.21.0' - implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0' + implementation 'org.commonmark:commonmark:0.22.0' + implementation 'org.commonmark:commonmark-ext-gfm-tables:0.22.0' // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0' From da3fc72e5c8a95f7b8caf307111e7888aa187ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:09:30 +0000 Subject: [PATCH 074/200] Bump org.projectlombok:lombok from 1.18.28 to 1.18.32 (#955) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.28 to 1.18.32. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.28...v1.18.32) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index be44e4dc..3b09764b 100644 --- a/build.gradle +++ b/build.gradle @@ -159,8 +159,8 @@ dependencies { implementation 'com.fathzer:javaluator:3.0.3' developmentOnly("org.springframework.boot:spring-boot-devtools:3.2.4") - compileOnly 'org.projectlombok:lombok:1.18.30' - annotationProcessor 'org.projectlombok:lombok:1.18.28' + compileOnly 'org.projectlombok:lombok:1.18.32' + annotationProcessor 'org.projectlombok:lombok:1.18.32' } tasks.withType(JavaCompile) { From 78aa0d4c61dbb83cec3903e96e2239f5c2e3a7bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:10:56 +0000 Subject: [PATCH 075/200] Bump org.springframework.boot:spring-boot-starter-data-jpa from 3.2.3 to 3.2.4 (#953) Bump org.springframework.boot:spring-boot-starter-data-jpa Bumps [org.springframework.boot:spring-boot-starter-data-jpa](https://github.com/spring-projects/spring-boot) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-data-jpa dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3b09764b..8e4740c7 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ dependencies { if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') { implementation 'org.springframework.boot:spring-boot-starter-security:3.2.3' implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE' - implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.3" + implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.4" //2.2.x requires rebuild of DB file.. need migration path implementation "com.h2database:h2:2.1.214" From 6c603618ce57245c847cdcc5a740c1292f1c2b58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:12:33 +0000 Subject: [PATCH 076/200] Bump org.springframework.boot:spring-boot-starter-security from 3.2.3 to 3.2.4 (#956) Bump org.springframework.boot:spring-boot-starter-security Bumps [org.springframework.boot:spring-boot-starter-security](https://github.com/spring-projects/spring-boot) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8e4740c7..33fd4385 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.3' if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') { - implementation 'org.springframework.boot:spring-boot-starter-security:3.2.3' + implementation 'org.springframework.boot:spring-boot-starter-security:3.2.4' implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE' implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.2.4" From aa895d10ac857e99bb2249cb09dbe91df796de20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:13:55 +0000 Subject: [PATCH 077/200] Bump org.springframework.boot:spring-boot-starter-thymeleaf from 3.2.3 to 3.2.4 (#954) Bump org.springframework.boot:spring-boot-starter-thymeleaf Bumps [org.springframework.boot:spring-boot-starter-thymeleaf](https://github.com/spring-projects/spring-boot) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-thymeleaf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33fd4385..b3b280ed 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ dependencies { implementation 'org.yaml:snakeyaml:2.2' implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.3' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.4' if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') { implementation 'org.springframework.boot:spring-boot-starter-security:3.2.4' From 3c53f97c36b54224b4844e6b0d6502fbc75df3e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:17:53 +0000 Subject: [PATCH 078/200] Update 3rd Party Licenses (#960) Signed-off-by: GitHub Action Co-authored-by: GitHub Action --- src/main/resources/static/3rdPartyLicenses.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index 451fec90..f31b524a 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -474,13 +474,13 @@ }, { "moduleName": "org.commonmark:commonmark", - "moduleVersion": "0.21.0", + "moduleVersion": "0.22.0", "moduleLicense": "BSD 2-Clause License", "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause" }, { "moduleName": "org.commonmark:commonmark-ext-gfm-tables", - "moduleVersion": "0.21.0", + "moduleVersion": "0.22.0", "moduleLicense": "BSD 2-Clause License", "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause" }, @@ -691,7 +691,7 @@ { "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -719,14 +719,14 @@ { "moduleName": "org.springframework.boot:spring-boot-starter-security", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-starter-thymeleaf", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, From c1724ef74c677d373562be775ea7479d7d5edf80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:24:06 +0000 Subject: [PATCH 079/200] Bump org.springdoc:springdoc-openapi-starter-webmvc-ui from 2.2.0 to 2.4.0 (#964) Bump org.springdoc:springdoc-openapi-starter-webmvc-ui Bumps [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) from 2.2.0 to 2.4.0. - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.2.0...v2.4.0) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b3b280ed..f93a5057 100644 --- a/build.gradle +++ b/build.gradle @@ -128,7 +128,7 @@ dependencies { // implementation 'com.twelvemonkeys.imageio:imageio-xwd:3.10.1' implementation 'commons-io:commons-io:2.15.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0' //general PDF From cfcf02708cfe480ab24fab9614e572dde2e9abe4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:24:15 +0000 Subject: [PATCH 080/200] Bump org.springframework.boot from 3.2.3 to 3.2.4 (#962) Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f93a5057..afc1f0f2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.2.3' + id 'org.springframework.boot' version '3.2.4' id 'io.spring.dependency-management' version '1.1.3' id 'org.springdoc.openapi-gradle-plugin' version '1.8.0' id "io.swagger.swaggerhub" version "1.3.2" From 029937a1c57733aa7695cc28e822c3312f4d1b93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:24:20 +0000 Subject: [PATCH 081/200] Bump org.springframework.boot:spring-boot-starter-test from 3.2.3 to 3.2.4 (#961) Bump org.springframework.boot:spring-boot-starter-test Bumps [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index afc1f0f2..33c4835d 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ dependencies { implementation "com.h2database:h2:2.1.214" } - testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.3' + testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.4' // Batik implementation 'org.apache.xmlgraphics:batik-all:1.17' From 7f17b338590e66780187fd4c8394fb0ac4a302ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:40:59 +0000 Subject: [PATCH 082/200] Bump org.apache.pdfbox:pdfbox from 3.0.1 to 3.0.2 (#963) Bumps org.apache.pdfbox:pdfbox from 3.0.1 to 3.0.2. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33c4835d..770c9a5b 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' } - implementation ('org.apache.pdfbox:pdfbox:3.0.1'){ + implementation ('org.apache.pdfbox:pdfbox:3.0.2'){ exclude group: 'commons-logging', module: 'commons-logging' } From a20c3018aee9d31f5651d36610e57934539fb8f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:41:09 +0000 Subject: [PATCH 083/200] Update 3rd Party Licenses (#965) Signed-off-by: GitHub Action Co-authored-by: GitHub Action --- .../resources/static/3rdPartyLicenses.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index f31b524a..085a3ce7 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -228,7 +228,7 @@ { "moduleName": "io.micrometer:micrometer-commons", "moduleUrl": "https://github.com/micrometer-metrics/micrometer", - "moduleVersion": "1.12.3", + "moduleVersion": "1.12.4", "moduleLicense": "The Apache Software License, Version 2.0", "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" }, @@ -242,14 +242,14 @@ { "moduleName": "io.micrometer:micrometer-jakarta9", "moduleUrl": "https://github.com/micrometer-metrics/micrometer", - "moduleVersion": "1.12.3", + "moduleVersion": "1.12.4", "moduleLicense": "The Apache Software License, Version 2.0", "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "io.micrometer:micrometer-observation", "moduleUrl": "https://github.com/micrometer-metrics/micrometer", - "moduleVersion": "1.12.3", + "moduleVersion": "1.12.4", "moduleLicense": "The Apache Software License, Version 2.0", "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" }, @@ -262,28 +262,28 @@ { "moduleName": "io.swagger.core.v3:swagger-annotations-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-annotations", - "moduleVersion": "2.2.15", + "moduleVersion": "2.2.20", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "io.swagger.core.v3:swagger-core-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-core", - "moduleVersion": "2.2.15", + "moduleVersion": "2.2.20", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "io.swagger.core.v3:swagger-models-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-models", - "moduleVersion": "2.2.15", + "moduleVersion": "2.2.20", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "jakarta.activation:jakarta.activation-api", "moduleUrl": "https://www.eclipse.org", - "moduleVersion": "2.1.2", + "moduleVersion": "2.1.3", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, @@ -325,7 +325,7 @@ { "moduleName": "jakarta.xml.bind:jakarta.xml.bind-api", "moduleUrl": "https://www.eclipse.org", - "moduleVersion": "4.0.1", + "moduleVersion": "4.0.2", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, @@ -487,28 +487,28 @@ { "moduleName": "org.eclipse.angus:angus-activation", "moduleUrl": "https://www.eclipse.org", - "moduleVersion": "2.0.1", + "moduleVersion": "2.0.2", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, { "moduleName": "org.glassfish.jaxb:jaxb-core", "moduleUrl": "https://www.eclipse.org", - "moduleVersion": "4.0.4", + "moduleVersion": "4.0.5", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, { "moduleName": "org.glassfish.jaxb:jaxb-runtime", "moduleUrl": "https://www.eclipse.org", - "moduleVersion": "4.0.4", + "moduleVersion": "4.0.5", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, { "moduleName": "org.glassfish.jaxb:txw2", "moduleUrl": "https://eclipse-ee4j.github.io/jaxb-ri/", - "moduleVersion": "4.0.4", + "moduleVersion": "4.0.5", "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception", "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html" }, @@ -616,47 +616,47 @@ }, { "moduleName": "org.springdoc:springdoc-openapi-starter-common", - "moduleVersion": "2.2.0", + "moduleVersion": "2.4.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-api", - "moduleVersion": "2.2.0", + "moduleVersion": "2.4.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-ui", - "moduleVersion": "2.2.0", + "moduleVersion": "2.4.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.springframework.boot:spring-boot", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-actuator", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-actuator-autoconfigure", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-autoconfigure", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -670,7 +670,7 @@ { "moduleName": "org.springframework.boot:spring-boot-starter", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -684,7 +684,7 @@ { "moduleName": "org.springframework.boot:spring-boot-starter-aop", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -698,21 +698,21 @@ { "moduleName": "org.springframework.boot:spring-boot-starter-jdbc", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-starter-json", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.boot:spring-boot-starter-logging", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -733,7 +733,7 @@ { "moduleName": "org.springframework.boot:spring-boot-starter-tomcat", "moduleUrl": "https://spring.io/projects/spring-boot", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -747,119 +747,119 @@ { "moduleName": "org.springframework.data:spring-data-commons", "moduleUrl": "https://spring.io/projects/spring-data", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.data:spring-data-jpa", "moduleUrl": "https://projects.spring.io/spring-data-jpa", - "moduleVersion": "3.2.3", + "moduleVersion": "3.2.4", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.security:spring-security-config", "moduleUrl": "https://spring.io/projects/spring-security", - "moduleVersion": "6.2.2", + "moduleVersion": "6.2.3", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.security:spring-security-core", "moduleUrl": "https://spring.io/projects/spring-security", - "moduleVersion": "6.2.2", + "moduleVersion": "6.2.3", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.security:spring-security-crypto", "moduleUrl": "https://spring.io/projects/spring-security", - "moduleVersion": "6.2.2", + "moduleVersion": "6.2.3", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework.security:spring-security-web", "moduleUrl": "https://spring.io/projects/spring-security", - "moduleVersion": "6.2.2", + "moduleVersion": "6.2.3", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-aop", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-aspects", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-beans", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-context", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-core", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-expression", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-jcl", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-jdbc", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-orm", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-tx", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "org.springframework:spring-web", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.4", + "moduleVersion": "6.1.5", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -904,7 +904,7 @@ { "moduleName": "org.webjars:swagger-ui", "moduleUrl": "http://webjars.org", - "moduleVersion": "5.2.0", + "moduleVersion": "5.11.8", "moduleLicense": "Apache 2.0", "moduleLicenseUrl": "https://github.com/swagger-api/swagger-ui" }, From e2bd73dbf366af29f73d091924e6a4422021821e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:42:34 +0000 Subject: [PATCH 084/200] Update 3rd Party Licenses (#966) Signed-off-by: GitHub Action Co-authored-by: GitHub Action --- .../resources/static/3rdPartyLicenses.json | 59 +------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index 085a3ce7..1858384e 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -378,21 +378,21 @@ { "moduleName": "org.apache.pdfbox:fontbox", "moduleUrl": "https://pdfbox.apache.org", - "moduleVersion": "3.0.1", + "moduleVersion": "3.0.2", "moduleLicense": "Apache-2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.apache.pdfbox:pdfbox", "moduleUrl": "https://pdfbox.apache.org", - "moduleVersion": "3.0.1", + "moduleVersion": "3.0.2", "moduleLicense": "Apache-2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.apache.pdfbox:pdfbox-io", "moduleUrl": "https://pdfbox.apache.org", - "moduleVersion": "3.0.1", + "moduleVersion": "3.0.2", "moduleLicense": "Apache-2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, @@ -540,52 +540,6 @@ "moduleLicense": "Public Domain", "moduleLicenseUrl": "http://repository.jboss.org/licenses/cc0-1.0.txt" }, - { - "moduleName": "org.junit.jupiter:junit-jupiter", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "5.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit.jupiter:junit-jupiter-api", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "5.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit.jupiter:junit-jupiter-engine", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "5.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit.jupiter:junit-jupiter-params", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "5.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit.platform:junit-platform-commons", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "1.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit.platform:junit-platform-engine", - "moduleUrl": "https://junit.org/junit5/", - "moduleVersion": "1.10.2", - "moduleLicense": "Eclipse Public License v2.0", - "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html" - }, - { - "moduleName": "org.junit:junit-bom", - "moduleVersion": "5.10.2" - }, { "moduleName": "org.latencyutils:LatencyUtils", "moduleUrl": "http://latencyutils.github.io/LatencyUtils/", @@ -593,13 +547,6 @@ "moduleLicense": "Public Domain, per Creative Commons CC0", "moduleLicenseUrl": "http://creativecommons.org/publicdomain/zero/1.0/" }, - { - "moduleName": "org.opentest4j:opentest4j", - "moduleUrl": "https://github.com/ota4j-team/opentest4j", - "moduleVersion": "1.3.0", - "moduleLicense": "The Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" - }, { "moduleName": "org.slf4j:jul-to-slf4j", "moduleUrl": "http://www.slf4j.org", From 3800e3e465336aef7c86c977552cac093fb60f9a Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:15:10 +0000 Subject: [PATCH 085/200] Update view-pdf.html --- src/main/resources/templates/view-pdf.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/view-pdf.html b/src/main/resources/templates/view-pdf.html index afe4e957..5d08d597 100644 --- a/src/main/resources/templates/view-pdf.html +++ b/src/main/resources/templates/view-pdf.html @@ -35,7 +35,7 @@ See https://github.com/adobe-type-tools/cmap-resources - + From 3c08c204262c2536d354b60b688e7cc65c4118d0 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 22 Mar 2024 19:57:43 +0000 Subject: [PATCH 086/200] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 770c9a5b..b4580d88 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { import com.github.jk1.license.render.* group = 'stirling.software' -version = '0.22.3' +version = '0.22.4' sourceCompatibility = '17' repositories { From 6bd6e6563ba311740c410272318caa039b2f5485 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:01:37 +0000 Subject: [PATCH 087/200] Update Chart.yaml --- chart/stirling-pdf/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml index f355b44c..d11c95e2 100644 --- a/chart/stirling-pdf/Chart.yaml +++ b/chart/stirling-pdf/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.22.3 +appVersion: 0.22.4 description: locally hosted web application that allows you to perform various operations on PDF files home: https://github.com/Stirling-Tools/Stirling-PDF keywords: From 09cb92e235b50485029f6a57d3c74805f99971dc Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:15:42 +0000 Subject: [PATCH 088/200] github bug --- .github/workflows/swagger.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index 3ac41119..f60bc15f 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -5,9 +5,7 @@ on: push: branches: - master - paths-ignore: - - ".github/**" - - "**/*.md" + jobs: push: @@ -37,4 +35,4 @@ jobs: run: | curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"published\":true,\"default\":true}" env: - SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} \ No newline at end of file + SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} From c9331afeacc648f8d62f72cba8d4a083693818de Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:15:53 +0000 Subject: [PATCH 089/200] github bug --- .github/workflows/push-docker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index f415e292..1856d93f 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -6,9 +6,6 @@ on: branches: - master - main - paths-ignore: - - ".github/**" - - "**/*.md" permissions: contents: read From 14ef7c0a721fbe95494908b8a084b1154ad8a323 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:16:14 +0000 Subject: [PATCH 090/200] dummy commit (#968) Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c99b5347..f5833772 100644 --- a/README.md +++ b/README.md @@ -255,7 +255,6 @@ To add new users go to the bottom of Account settings and hit 'Admin Settings', For API usage you must provide a header with 'X-API-Key' and the associated API key for that user. - ## FAQ ### Q1: What are your planned features? From 31ec3852829505ebba9f5b387cb3e3eaf8a005a9 Mon Sep 17 00:00:00 2001 From: NeilJared Date: Mon, 25 Mar 2024 20:07:53 +0100 Subject: [PATCH 091/200] Update messages_es_ES.properties (#969) Updated es_ES translation (100% done) --- src/main/resources/messages_es_ES.properties | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 8e93da1d..ffa0c6c5 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -17,11 +17,11 @@ true=Verdadero false=Falso unknown=Desconocido save=Guardar -saveToBrowser=Save to Browser +saveToBrowser=Guardar en el Navegador close=Cerrar filesSelected=archivos seleccionados noFavourites=No se agregaron favoritos -downloadComplete=Download Complete +downloadComplete=Descarga finalizada bored=¿Cansado de esperar? alphabet=Alfabeto downloadPdf=Descargar PDF @@ -54,9 +54,9 @@ notAuthenticatedMessage=Usuario no autentificado. userNotFoundMessage=Usuario no encontrado. incorrectPasswordMessage=La contraseña actual no es correcta. usernameExistsMessage=El nuevo nombre de usuario está en uso. -invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. -deleteCurrentUserMessage=Cannot delete currently logged in user. -deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +invalidUsernameMessage=Nombre de usuario no válido, El nombre de ususario debe contener únicamente números y caracteres alfabéticos. +deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso. +deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse. ############### @@ -112,7 +112,7 @@ settings.accountSettings=Configuración de la cuenta changeCreds.title=Cambiar Credenciales changeCreds.header=Actualice los detalles de su cuenta -changeCreds.changePassword=You are using default login credentials. Please enter a new password +changeCreds.changePassword=Está usando las credenciales de inicio de sesión por defecto. Por favor, introduzca una contraseña nueva changeCreds.newUsername=Nuevo usuario changeCreds.oldPassword=Contraseña actual changeCreds.newPassword=Nueva contraseña @@ -147,15 +147,15 @@ adminUserSettings.header=Configuración de control de usuario administrador adminUserSettings.admin=Administrador adminUserSettings.user=Usuario adminUserSettings.addUser=Añadir Nuevo Usuario -adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters. +adminUserSettings.usernameInfo=El nombrede usuario debe contener únicamente letras y números, no espacios ni caracteres especiales. adminUserSettings.roles=Roles adminUserSettings.role=Rol adminUserSettings.actions=Acciones adminUserSettings.apiUser=Usuario limitado de API -adminUserSettings.extraApiUser=Additional Limited API User +adminUserSettings.extraApiUser=Otro usuario limitado de API adminUserSettings.webOnlyUser=Usuario solo web -adminUserSettings.demoUser=Demo User (No custom settings) -adminUserSettings.internalApiUser=Internal API User +adminUserSettings.demoUser=Usuario Demo (Sin ajustes personalizados) +adminUserSettings.internalApiUser=Usuario interno de API adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso adminUserSettings.submit=Guardar Usuario @@ -375,7 +375,7 @@ showJS.tags=JS home.autoRedact.title=Auto Redactar home.autoRedact.desc=Redactar automáticamente (ocultar) texto en un PDF según el texto introducido -autoRedact.tags=Redact,Hide,black out,black,marker,hidden +autoRedact.tags=Redactar,Ocultar,ocultar,negro,subrayador,oculto home.tableExtraxt.title=PDF a CSV home.tableExtraxt.desc=Extraer Tablas de un PDF convirtiéndolas a CSV @@ -395,18 +395,18 @@ home.split-by-sections.title=Dividir PDF por Secciones home.split-by-sections.desc=Dividir cada página de un PDF en secciones verticales y horizontales más pequeñas split-by-sections.tags=Dividir sección, Dividir, Personalizar -home.AddStampRequest.title=Add Stamp to PDF -home.AddStampRequest.desc=Add text or add image stamps at set locations -AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.AddStampRequest.title=Añadir Sello a PDF +home.AddStampRequest.desc=Añadir texto o sello de imagen en ubicaciones específicas +AddStampRequest.tags=Sello, Añadir imagen, centrar imagen, Marca de agua, PDF, Incrustar, Personalizar -home.PDFToBook.title=PDF to Book -home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre -PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.PDFToBook.title=PDF a Libro +home.PDFToBook.desc=Convierte PDF a formatos de Libro/Cómic usando Calibre +PDFToBook.tags=Libro,Cómic,Calibre,Convertir,Manga,Amazon,Kindle -home.BookToPDF.title=Book to PDF -home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre -BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.BookToPDF.title=Libro a PDF +home.BookToPDF.desc=Convierte formatos de Libro/Cómic a PDF usando Calibre +BookToPDF.tags=Libro,Cómic,Calibre,Convertir,manga,Amazon,Kindle ########################### @@ -642,17 +642,17 @@ compare.document.2=Documento 2 compare.submit=Comparar #BookToPDF -BookToPDF.title=Books and Comics to PDF -BookToPDF.header=Book to PDF -BookToPDF.credit=Uses Calibre -BookToPDF.submit=Convert +BookToPDF.title=Libros y Cómics a PDF +BookToPDF.header=Libro a PDF +BookToPDF.credit=Usa Calibre +BookToPDF.submit=Convertir #PDFToBook -PDFToBook.title=PDF to Book -PDFToBook.header=PDF to Book -PDFToBook.selectText.1=Format -PDFToBook.credit=Uses Calibre -PDFToBook.submit=Convert +PDFToBook.title=PDF a Libro +PDFToBook.header=PDF a Libro +PDFToBook.selectText.1=Formato +PDFToBook.credit=Utiliza Calibre +PDFToBook.submit=Convertir #sign sign.title=Firmar @@ -990,7 +990,7 @@ split-by-sections.vertical.label=Divisiones Verticales split-by-sections.horizontal.placeholder=Introduzca el número de divisiones horizontales split-by-sections.vertical.placeholder=Introduzca el número de divisiones verticales split-by-sections.submit=Dividir PDF -split-by-sections.merge=Merge Into One PDF +split-by-sections.merge=Unir en Un PDF #licenses licenses.nav=Licencias From 7e2d58b3e8e37222cd2f312a1807d5a624e3d93b Mon Sep 17 00:00:00 2001 From: tkymmm <136296842+tkymmm@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:55:51 +0900 Subject: [PATCH 092/200] Update messages_ja_JP.properties (#975) --- src/main/resources/messages_ja_JP.properties | 124 +++++++++---------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 14cf5f4a..68e44ea6 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -17,11 +17,11 @@ true=True false=False unknown=不明 save=保存 -saveToBrowser=Save to Browser +saveToBrowser=ブラウザへ保存 close=閉じる filesSelected=選択されたファイル noFavourites=お気に入りはありません -downloadComplete=Download Complete +downloadComplete=ダウンロード完了 bored=待ち時間が退屈 alphabet=アルファベット downloadPdf=PDFをダウンロード @@ -45,18 +45,18 @@ red=赤 green=緑 blue=青 custom=カスタム... -WorkInProgess=Work in progress, May not work or be buggy, Please report any problems! +WorkInProgess=作業中です。動作しないまたはバグがある可能性があります。問題があれば報告してください！ poweredBy=Powered by -yes=Yes -no=No +yes=はい +no=いいえ changedCredsMessage=資格情報が変更されました！ notAuthenticatedMessage=ユーザーが認証されていません。 userNotFoundMessage=ユーザーが見つかりません。 incorrectPasswordMessage=現在のパスワードが正しくありません。 usernameExistsMessage=新しいユーザー名はすでに存在します。 -invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. -deleteCurrentUserMessage=Cannot delete currently logged in user. -deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +invalidUsernameMessage=ユーザー名が無効です。ユーザー名にはアルファベットと数字のみを使用してください。 +deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。 +deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。 ############### @@ -112,7 +112,7 @@ settings.accountSettings=アカウント設定 changeCreds.title=資格情報の変更 changeCreds.header=アカウントの詳細を更新する -changeCreds.changePassword=You are using default login credentials. Please enter a new password +changeCreds.changePassword=デフォルトのログイン認証情報を使用しています。新しいパスワードを入力してください changeCreds.newUsername=新しいユーザー名 changeCreds.oldPassword=現在のパスワード changeCreds.newPassword=新しいパスワード @@ -147,15 +147,15 @@ adminUserSettings.header=管理者ユーザー制御設定 adminUserSettings.admin=管理者 adminUserSettings.user=ユーザー adminUserSettings.addUser=新しいユーザを追加 -adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters. +adminUserSettings.usernameInfo=ユーザー名には文字と数字のみが使用でき、スペースや特殊文字は使用できません。 adminUserSettings.roles=役割 adminUserSettings.role=役割 adminUserSettings.actions=アクション adminUserSettings.apiUser=限定されたAPIユーザー -adminUserSettings.extraApiUser=Additional Limited API User +adminUserSettings.extraApiUser=追加の制限付きAPIユーザー adminUserSettings.webOnlyUser=ウェブ専用ユーザー -adminUserSettings.demoUser=Demo User (No custom settings) -adminUserSettings.internalApiUser=Internal API User +adminUserSettings.demoUser=デモユーザー (カスタム設定なし) +adminUserSettings.internalApiUser=内部APIユーザー adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する adminUserSettings.submit=ユーザーの保存 @@ -395,17 +395,17 @@ home.split-by-sections.title=PDFをセクションで分割 home.split-by-sections.desc=PDFの各ページを縦横に分割します。 split-by-sections.tags=Section Split, Divide, Customize -home.AddStampRequest.title=Add Stamp to PDF -home.AddStampRequest.desc=Add text or add image stamps at set locations +home.AddStampRequest.title=PDFにスタンプを追加 +home.AddStampRequest.desc=設定した位置にテキストや画像のスタンプを追加できます AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize -home.PDFToBook.title=PDF to Book -home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre +home.PDFToBook.title=PDFを書籍に変換 +home.PDFToBook.desc=calibreを使用してPDFを書籍/コミック形式に変換します PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle -home.BookToPDF.title=Book to PDF -home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre +home.BookToPDF.title=PDFを書籍に変換 +home.BookToPDF.desc=calibreを使用してPDFを書籍/コミック形式に変換します BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle @@ -485,37 +485,37 @@ HTMLToPDF.header=HTMLをPDFに変換 HTMLToPDF.help=HTMLファイルと必要なhtml/css/画像などを含むZIPを受け入れます HTMLToPDF.submit=変換 HTMLToPDF.credit=WeasyPrintを使用 -HTMLToPDF.zoom=Zoom level for displaying the website. -HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default) -HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default) -HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default) -HTMLToPDF.printBackground=Render the background of websites. -HTMLToPDF.defaultHeader=Enable Default Header (Name and page number) -HTMLToPDF.cssMediaType=Change the CSS media type of the page. -HTMLToPDF.none=None -HTMLToPDF.print=Print -HTMLToPDF.screen=Screen +HTMLToPDF.zoom=Webサイトを表示するためのズームレベル。 +HTMLToPDF.pageWidth=ページ幅 (cm)。 (デフォルトでは空白) +HTMLToPDF.pageHeight=ページ高さ (cm)。 (デフォルトでは空白) +HTMLToPDF.marginTop=ページ上の余白 (mm)。 (デフォルトでは空白) +HTMLToPDF.marginBottom=ページ下の余白 (mm)。 (デフォルトでは空白) +HTMLToPDF.marginLeft=ページ左の余白 (mm)。 (デフォルトでは空白) +HTMLToPDF.marginRight=ページ右の余白 (mm)。 (デフォルトでは空白) +HTMLToPDF.printBackground=Webサイトの背景をレンダリングします。 +HTMLToPDF.defaultHeader=デフォルトのヘッダー (名前とページ番号) を有効にする +HTMLToPDF.cssMediaType=ページのCSSメディアタイプを変更します。 +HTMLToPDF.none=なし +HTMLToPDF.print=印刷 +HTMLToPDF.screen=画面 #AddStampRequest -AddStampRequest.header=Stamp PDF -AddStampRequest.title=Stamp PDF -AddStampRequest.stampType=Stamp Type -AddStampRequest.stampText=Stamp Text -AddStampRequest.stampImage=Stamp Image -AddStampRequest.alphabet=Alphabet -AddStampRequest.fontSize=Font/Image Size -AddStampRequest.rotation=Rotation -AddStampRequest.opacity=Opacity -AddStampRequest.position=Position -AddStampRequest.overrideX=Override X Coordinate -AddStampRequest.overrideY=Override Y Coordinate -AddStampRequest.customMargin=Custom Margin -AddStampRequest.customColor=Custom Text Color -AddStampRequest.submit=Submit +AddStampRequest.header=PDFにスタンプを押す +AddStampRequest.title=PDFにスタンプを押す +AddStampRequest.stampType=スタンプの種類 +AddStampRequest.stampText=スタンプする文章 +AddStampRequest.stampImage=スタンプする画像 +AddStampRequest.alphabet=文字 +AddStampRequest.fontSize=フォント/画像 サイズ +AddStampRequest.rotation=回転 +AddStampRequest.opacity=不透明度 +AddStampRequest.position=位置 +AddStampRequest.overrideX=X座標のオーバーライド +AddStampRequest.overrideY=Y座標のオーバーライド +AddStampRequest.customMargin=余白のカスタム +AddStampRequest.customColor=文字色のカスタム +AddStampRequest.submit=送信 #sanitizePDF @@ -588,7 +588,7 @@ pipeline.title=パイプライン pageLayout.title=マルチページレイアウト pageLayout.header=マルチページレイアウト pageLayout.pagesPerSheet=1枚あたりのページ数: -pageLayout.addBorder=Add Borders +pageLayout.addBorder=境界線を追加 pageLayout.submit=送信 @@ -604,11 +604,11 @@ scalePages.submit=送信 certSign.title=証明書による署名 certSign.header=証明書を使用してPDFに署名します。 (制作中) certSign.selectPDF=署名するPDFファイルを選択: -certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below. +certSign.jksNote=注: 証明書のタイプが以下にリストされていない場合は、keytoolコマンドラインツールを使用して証明書をJavaキーストア(.jks)ファイルに変換してください。次に以下の.jksファイル オプションを選択します。 certSign.selectKey=秘密キーファイルを選択 (PKCS#8形式、.pemまたは.der) : certSign.selectCert=証明書ファイルを選択 (X.509形式、.pemまたは.der) : certSign.selectP12=PKCS#12キーストアファイルを選択 (.p12または.pfx) (オプション。指定する場合は秘密キーと証明書が含まれている必要があります。): -certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore): +certSign.selectJKS=Javaキーストアファイルを選択 (.jks or .keystore): certSign.certType=証明書の種類 certSign.password=キーストアまたは秘密キーのパスワードを入力 (ある場合) : certSign.showSig=署名を表示 @@ -631,7 +631,7 @@ removeBlanks.submit=空白ページの削除 #removeAnnotations removeAnnotations.title=注釈の削除 removeAnnotations.header=注釈の削除 -removeAnnotations.submit=Remove +removeAnnotations.submit=削除 #compare @@ -642,17 +642,17 @@ compare.document.2=ドキュメント 2 compare.submit=比較 #BookToPDF -BookToPDF.title=Books and Comics to PDF -BookToPDF.header=Book to PDF -BookToPDF.credit=Uses Calibre -BookToPDF.submit=Convert +BookToPDF.title=書籍やコミックをPDFに変換 +BookToPDF.header=書籍をPDFに変換 +BookToPDF.credit=calibreを使用 +BookToPDF.submit=変換 #PDFToBook -PDFToBook.title=PDF to Book -PDFToBook.header=PDF to Book -PDFToBook.selectText.1=Format -PDFToBook.credit=Uses Calibre -PDFToBook.submit=Convert +PDFToBook.title=書籍をPDFに変換 +PDFToBook.header=書籍をPDFに変換 +PDFToBook.selectText.1=フォーマット +PDFToBook.credit=calibreを使用 +PDFToBook.submit=変換 #sign sign.title=署名 @@ -855,8 +855,8 @@ watermark.selectText.4=回転 (0-360): watermark.selectText.5=幅スペース (各透かし間の水平方向のスペース): watermark.selectText.6=高さスペース (各透かし間の垂直方向のスペース): watermark.selectText.7=不透明度 (0% - 100%): -watermark.selectText.8=Watermark Type: -watermark.selectText.9=Watermark Image: +watermark.selectText.8=透かしの種類: +watermark.selectText.9=透かしの画像: watermark.submit=透かしを追加 From 2fff3083ae9d608397582abbde86cff0e79d123d Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Tue, 26 Mar 2024 19:25:16 +0000 Subject: [PATCH 093/200] Update TextFinder.java (#980) --- .../software/SPDF/pdf/TextFinder.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/pdf/TextFinder.java b/src/main/java/stirling/software/SPDF/pdf/TextFinder.java index cdfb5501..f9e339c2 100644 --- a/src/main/java/stirling/software/SPDF/pdf/TextFinder.java +++ b/src/main/java/stirling/software/SPDF/pdf/TextFinder.java @@ -19,6 +19,16 @@ public class TextFinder extends PDFTextStripper { private final boolean wholeWordSearch; private final List textOccurrences = new ArrayList<>(); + private class MatchInfo { + int startIndex; + int matchLength; + + MatchInfo(int startIndex, int matchLength) { + this.startIndex = startIndex; + this.matchLength = matchLength; + } + } + public TextFinder(String searchText, boolean useRegex, boolean wholeWordSearch) throws IOException { this.searchText = searchText.toLowerCase(); @@ -27,36 +37,37 @@ public class TextFinder extends PDFTextStripper { setSortByPosition(true); } - private List findOccurrencesInText(String searchText, String content) { - List indexes = new ArrayList<>(); + private List findOccurrencesInText(String searchText, String content) { + List matches = new ArrayList<>(); + Pattern pattern; if (useRegex) { // Use regex-based search pattern = wholeWordSearch - ? Pattern.compile("(\\b|_|\\.)" + searchText + "(\\b|_|\\.)") + ? Pattern.compile("\\b" + searchText + "\\b") : Pattern.compile(searchText); } else { // Use normal text search pattern = wholeWordSearch - ? Pattern.compile( - "(\\b|_|\\.)" + Pattern.quote(searchText) + "(\\b|_|\\.)") + ? Pattern.compile("\\b" + Pattern.quote(searchText) + "\\b") : Pattern.compile(Pattern.quote(searchText)); } Matcher matcher = pattern.matcher(content); while (matcher.find()) { - indexes.add(matcher.start()); + matches.add(new MatchInfo(matcher.start(), matcher.end() - matcher.start())); } - return indexes; + return matches; } @Override protected void writeString(String text, List textPositions) { - for (Integer index : findOccurrencesInText(searchText, text.toLowerCase())) { - if (index + searchText.length() <= textPositions.size()) { + for (MatchInfo match : findOccurrencesInText(searchText, text.toLowerCase())) { + int index = match.startIndex; + if (index + match.matchLength <= textPositions.size()) { // Initial values based on the first character TextPosition first = textPositions.get(index); float minX = first.getX(); @@ -65,7 +76,7 @@ public class TextFinder extends PDFTextStripper { float maxY = first.getY() + first.getHeight(); // Loop over the rest of the characters and adjust bounding box values - for (int i = index; i < index + searchText.length(); i++) { + for (int i = index; i < index + match.matchLength; i++) { TextPosition position = textPositions.get(i); minX = Math.min(minX, position.getX()); minY = Math.min(minY, position.getY()); From eda838d6f8522bf8be405aaf774335d7dcbc8849 Mon Sep 17 00:00:00 2001 From: CocoMaster-AI <138378888+cocomastergo@users.noreply.github.com> Date: Fri, 29 Mar 2024 00:53:39 +0800 Subject: [PATCH 094/200] feat: Extract translation text from html and finished the mainly translation of zh_CN, zh_TW, ja_JP file (#987) * feat: translate zh_cn properties * feat: adjust some description messages_zh_CN.properties * feat: translate zh_TW file done * feat: zh_CN semantic optimization * feat: Supplementary ja_JP translation * feat: extract rest text * feat: Sync to all lang.properties * feat: translate zh_CN, zh_TW, ja_JP file * fix: small bug --------- Co-authored-by: yanyu_lin --- src/main/resources/messages_ar_AR.properties | 18 ++ src/main/resources/messages_bg_BG.properties | 18 ++ src/main/resources/messages_ca_CA.properties | 18 ++ src/main/resources/messages_de_DE.properties | 18 ++ src/main/resources/messages_el_GR.properties | 18 ++ src/main/resources/messages_en_GB.properties | 18 ++ src/main/resources/messages_en_US.properties | 18 ++ src/main/resources/messages_es_ES.properties | 18 ++ src/main/resources/messages_eu_ES.properties | 18 ++ src/main/resources/messages_fr_FR.properties | 18 ++ src/main/resources/messages_hi_IN.properties | 18 ++ src/main/resources/messages_hu_HU.properties | 18 ++ src/main/resources/messages_id_ID.properties | 18 ++ src/main/resources/messages_it_IT.properties | 18 ++ src/main/resources/messages_ja_JP.properties | 36 ++- src/main/resources/messages_ko_KR.properties | 18 ++ src/main/resources/messages_nl_NL.properties | 18 ++ src/main/resources/messages_pl_PL.properties | 18 ++ src/main/resources/messages_pt_BR.properties | 18 ++ src/main/resources/messages_pt_PT.properties | 18 ++ src/main/resources/messages_ro_RO.properties | 18 ++ src/main/resources/messages_ru_RU.properties | 18 ++ .../resources/messages_sr_LATN_RS.properties | 18 ++ src/main/resources/messages_sv_SE.properties | 18 ++ src/main/resources/messages_tr_TR.properties | 18 ++ src/main/resources/messages_zh_CN.properties | 246 ++++++++++-------- src/main/resources/messages_zh_TW.properties | 189 ++++++++------ .../templates/convert/pdf-to-pdfa.html | 2 +- .../resources/templates/extract-page.html | 2 +- .../templates/fragments/languages.html | 2 +- .../resources/templates/misc/add-image.html | 2 +- src/main/resources/templates/misc/stamp.html | 4 +- .../resources/templates/pdf-organizer.html | 22 +- src/main/resources/templates/pipeline.html | 4 +- .../resources/templates/remove-pages.html | 2 +- .../templates/security/add-watermark.html | 4 +- src/main/resources/templates/sign.html | 2 +- 37 files changed, 717 insertions(+), 232 deletions(-) diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 2083f6f8..9bcc5282 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=دمج pdfOrganiser.title=منظم الصفحة pdfOrganiser.header=منظم صفحات PDF pdfOrganiser.submit=إعادة ترتيب الصفحات +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=مزيل الصفحة pageRemover.header=مزيل صفحة PDF pageRemover.pagesToDelete=الصفحات المراد حذفها (أدخل قائمة بأرقام الصفحات مفصولة بفواصل): pageRemover.submit=حذف الصفحات +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=التعتيم (0٪ - 100٪): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=إضافة علامة مائية +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF إلى PDF / A pdfToPDFA.header=PDF إلى PDF / A pdfToPDFA.credit=تستخدم هذه الخدمة OCRmyPDF لتحويل PDF / A. pdfToPDFA.submit=تحويل +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 4d3eb2ca..54f7c7e4 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Преобразуване към единична стр pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Обединяване pdfOrganiser.title=Организатор на страници pdfOrganiser.header=Организатор на PDF страници pdfOrganiser.submit=Пренареждане на страниците +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Премахване на страници pageRemover.header=Премахване на PDF страници pageRemover.pagesToDelete=Страници за изтриване (Въведете списък с номера на страници, разделени със запетая) : pageRemover.submit=Изтриване на страници +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Непрозрачност (0% - 100%): watermark.selectText.8=Тип воден знак: watermark.selectText.9=Изображение за воден знак: watermark.submit=Добавяне на воден знак +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF към PDF/A pdfToPDFA.header=PDF към PDF/A pdfToPDFA.credit=Тази услуга използва OCRmyPDF за PDF/A преобразуване. pdfToPDFA.submit=Преобразуване +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 395cbd7e..89700c2c 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Fusiona pdfOrganiser.title=Organitzador de pàgines pdfOrganiser.header=Organitzador de pàgines PDF pdfOrganiser.submit=Reorganitza Pàgines +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Eliminació Pàgines pageRemover.header=Eliminació Pàgines PDF pageRemover.pagesToDelete=Pàgines a esborrar (Números de pàgina) : pageRemover.submit=Esborra Pàgines +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacitat (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Afegir Marca d'Aigua +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF a PDF/A pdfToPDFA.header=PDF a PDF/A pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A pdfToPDFA.submit=Converteix +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 16e4118e..c9057afb 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Benutzerdefinierter Upload pipeline.configureButton=Konfigurieren pipeline.defaultOption=Benutzerdefiniert pipeline.submitButton=Speichern +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Zusammenfassen pageExtracter.title=Seiten extrahieren pageExtracter.header=Seiten extrahieren pageExtracter.submit=Extrahieren +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Zusammenführen pdfOrganiser.title=Seiten anordnen pdfOrganiser.header=PDF Seitenorganisation pdfOrganiser.submit=Seiten anordnen +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Seiten entfernen pageRemover.header=PDF Seiten entfernen pageRemover.pagesToDelete=Seiten zu entfernen (geben Sie eine Kommagetrennte Liste der Seitenzahlen an): pageRemover.submit=Seiten löschen +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Deckkraft (0% - 100 %): watermark.selectText.8=Wasserzeichen Typ: watermark.selectText.9=Wasserzeichen-Bild: watermark.submit=Wasserzeichen hinzufügen +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF zu PDF/A pdfToPDFA.header=PDF zu PDF/A pdfToPDFA.credit=Dieser Dienst verwendet OCRmyPDF für die PDF/A-Konvertierung pdfToPDFA.submit=Konvertieren +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 799476ca..c0c46dbe 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Μετατροπή σε Μονή Σελίδα pageExtracter.title=Εξαγωγή Σελίδων pageExtracter.header=EΕξαγωγή Σελίδων pageExtracter.submit=Εξαγωγή +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Συγχώνευση pdfOrganiser.title=Διοργανωτής σελίδας pdfOrganiser.header=Διοργανωτής σελίδας PDF pdfOrganiser.submit=Αναδιάταξη σελίδων +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Αφαιρετής Σελίδων pageRemover.header=Αφαιρετής Σελίδων PDF pageRemover.pagesToDelete=Σελίδες προς διαγραφή (Εισαγάγετε μια λίστα με αριθμούς σελίδων διαχωρισμένων με κόμματα): pageRemover.submit=Αφαίρεση Σελίδων +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Αδιαφάνεια (Opacity) (0% - 100%): watermark.selectText.8=Τύπος Υδατογραφήματος: watermark.selectText.9=Εικόνα Υδατογραφήματος: watermark.submit=Προσθήκη Υδατογραφήματος +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF σε PDF/A pdfToPDFA.header=PDF σε PDF/A pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί OCRmyPDF για PDF/A μετατροπή pdfToPDFA.submit=Μετατροπή +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 110879e6..3710f9a4 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Merge pdfOrganiser.title=Page Organiser pdfOrganiser.header=PDF Page Organiser pdfOrganiser.submit=Rearrange Pages +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Page Remover pageRemover.header=PDF Page remover pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) : pageRemover.submit=Delete Pages +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacity (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Add Watermark +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF To PDF/A pdfToPDFA.header=PDF To PDF/A pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion pdfToPDFA.submit=Convert +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 2749a6f5..9f89bcb3 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Merge pdfOrganiser.title=Page Organizer pdfOrganiser.header=PDF Page Organizer pdfOrganiser.submit=Rearrange Pages +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Page Remover pageRemover.header=PDF Page remover pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) : pageRemover.submit=Delete Pages +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacity (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Add Watermark +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF To PDF/A pdfToPDFA.header=PDF To PDF/A pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion pdfToPDFA.submit=Convert +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index ffa0c6c5..6faeb1c3 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Cargar personalización pipeline.configureButton=Configurar pipeline.defaultOption=Personalizar pipeline.submitButton=Enviar +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convertir a página única pageExtracter.title=Extraer Páginas pageExtracter.header=Extraer Páginas pageExtracter.submit=Extraer +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Unir pdfOrganiser.title=Organizador de páginas pdfOrganiser.header=Organizador de páginas PDF pdfOrganiser.submit=Organizar páginas +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Eliminador de páginas pageRemover.header=Eliminador de páginas PDF pageRemover.pagesToDelete=Páginas a eliminar (introducir una lista de números de página separados por coma): pageRemover.submit=Eliminar Páginas +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacidad (0% - 100%): watermark.selectText.8=Tipo de marca de agua: watermark.selectText.9=Imagen de marca de agua: watermark.submit=Añadir marca de agua +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF a PDF/A pdfToPDFA.header=PDF a PDF/A pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A pdfToPDFA.submit=Convertir +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 58d1c83d..65c05f19 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Orrialde bakarrera bihurtu pageExtracter.title=Atera orriak pageExtracter.header=Atera orriak pageExtracter.submit=Atera +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Elkartu pdfOrganiser.title=Orrialdeen antolatzailea pdfOrganiser.header=PDF orrialdeen antolatzailea pdfOrganiser.submit=Antolatu orrialdeak +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Orrialdeen ezabatzailea pageRemover.header=PDF orrialdeen ezabatzailea pageRemover.pagesToDelete=Ezabatu beharreko orrialdeak (sartu komaz bereizitako orrialde-zenbakien zerrenda): pageRemover.submit=Ezabatu orrialdeak +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opakutasuna (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Gehitu ur-marka +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDFa PDF/A bihurtu pdfToPDFA.header=PDFa PDF/A bihurtu pdfToPDFA.credit=Zerbitzu honek OCRmyPDF erabiltzen du PDFak PDF/A bihurtzeko pdfToPDFA.submit=Bihurtu +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 0068ffdd..d4336ab2 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Télécharger une personnalisation pipeline.configureButton=Configurer pipeline.defaultOption=Personnaliser pipeline.submitButton=Soumettre +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convertir en une seule page pageExtracter.title=Extraire des pages pageExtracter.header=Extraire des pages pageExtracter.submit=Extraire +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Fusionner pdfOrganiser.title=Organiser pdfOrganiser.header=Organiser les pages pdfOrganiser.submit=Organiser +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Supprimer des pages pageRemover.header=Supprimer des pages pageRemover.pagesToDelete=Pages à supprimer (entrez une liste de numéros de pages séparés par des virgules) : pageRemover.submit=Supprimer les pages +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacité (de 0% à 100%) watermark.selectText.8=Type de filigrane watermark.selectText.9=Image du filigrane watermark.submit=Ajouter un filigrane +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF en PDF/A pdfToPDFA.header=PDF en PDF/A pdfToPDFA.credit=Ce service utilise OCRmyPDF pour la conversion en PDF/A. pdfToPDFA.submit=Convertir +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 2ac56339..737db83b 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=एकल पृष्ठ में परिवर्त pageExtracter.title=पृष्ठों को निकालें pageExtracter.header=पृष्ठों को निकालें pageExtracter.submit=निकालें +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=मर्ज करें pdfOrganiser.title=पेज व्यवस्थापक pdfOrganiser.header=PDF पेज व्यवस्थापक pdfOrganiser.submit=पृष्ठों को पुनः व्यवस्थित करें +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=पेज हटाने वाला pageRemover.header=पीडीएफ पेज हटाने वाला pageRemover.pagesToDelete=हटाने के पेज (पृष्ठ संख्याओं की व्यवस्था के लिए एक कॉमा से अलग संख्याओं की सूची दर्ज करें): pageRemover.submit=पेज हटाएं +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=अपारदर्शिता (0% - 100%): watermark.selectText.8=वॉटरमार्क प्रकार: watermark.selectText.9=वॉटरमार्क छवि: watermark.submit=वॉटरमार्क जोड़ें +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF से PDF/A में pdfToPDFA.header=PDF से PDF/A में pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए OCRmyPDF का उपयोग किया जाता है। pdfToPDFA.submit=परिवर्तित करें +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index b7fdcb25..ddac920e 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Átalakítás egyetlen oldallá pageExtracter.title=Oldalak kinyerése pageExtracter.header=Oldalak kinyerése pageExtracter.submit=Kinyerés +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Összevonás pdfOrganiser.title=Oldalszervező pdfOrganiser.header=PDF Oldalszervező pdfOrganiser.submit=Oldalak átrendezése +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Oldaltörlő pageRemover.header=PDF oldaltörlő pageRemover.pagesToDelete=Törlendő oldalak (adja meg az oldalszámok vesszővel elválasztott listáját): pageRemover.submit=Oldalak törlése +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Átlátszóság (0% - 100%): watermark.selectText.8=Vízjel típusa: watermark.selectText.9=Vízjel képe: watermark.submit=Vízjel hozzáadása +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF >> PDF/A pdfToPDFA.header=PDF >> PDF/A pdfToPDFA.credit=Ez a szolgáltatás az OCRmyPDF-t használja a PDF/A konverzióhoz pdfToPDFA.submit=Konvertálás +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index f16bcc78..f975c0a0 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Konversi ke Halaman Tunggal pageExtracter.title=Ekstrak Halaman pageExtracter.header=Ekstrak Halaman pageExtracter.submit=Ekstrak +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Gabungkan pdfOrganiser.title=Pengaturan Halaman pdfOrganiser.header=Pengaturan Halaman PDF pdfOrganiser.submit=Susun ulang halaman +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Penghapus Halaman pageRemover.header=Penghapus Halaman PDF pageRemover.pagesToDelete=Halaman yang akan dihapus (Masukkan daftar nomor halaman yang dipisahkan dengan koma) : pageRemover.submit=Hapus Halaman +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacity (0% - 100%): watermark.selectText.8=Tipe Watermark: watermark.selectText.9=Gambar Watermark: watermark.submit=Tambahkan Watermark +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF Ke PDF/A pdfToPDFA.header=PDF ke PDF/A pdfToPDFA.credit=Layanan ini menggunakan OCRmyPDF untuk konversi PDF/A. pdfToPDFA.submit=Konversi +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index bc6c9977..b124ff1f 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Caricamento personalizzato pipeline.configureButton=Configura pipeline.defaultOption=Personalizzato pipeline.submitButton=Invia +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Converti in pagina singola pageExtracter.title=Estrai pagine pageExtracter.header=Estrai pagine pageExtracter.submit=Estrai +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Unisci pdfOrganiser.title=Organizza pagine pdfOrganiser.header=Organizza le pagine di un PDF pdfOrganiser.submit=Riordina pagine +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Rimuovi pagine pageRemover.header=Rimuovi pagine da un PDF pageRemover.pagesToDelete=Pagine da eliminare (inserisci una lista di numeri separati da virgola): pageRemover.submit=Rimuovi pagine +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacità (0% - 100%): watermark.selectText.8=Tipo di filigrana: watermark.selectText.9=Immagine filigrana: watermark.submit=Aggiungi Filigrana +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=Da PDF a PDF/A pdfToPDFA.header=Da PDF a PDF/A pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A. pdfToPDFA.submit=Converti +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 68e44ea6..7f9bf32f 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -11,10 +11,10 @@ imgPrompt=画像を選択 genericSubmit=送信 processTimeWarning=警告:この処理はファイルサイズによって1分程度かかることがあります pageOrderPrompt=ページ順序 (ページ番号をカンマ区切り又は2n+1のような関数で入力): -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=カスタムページ選択(ページ番号1、5、6または2n + 1などの関数のコンマ区切りリストを入力します): goToPage=移動 -true=True -false=False +true=真 +false=偽 unknown=不明 save=保存 saveToBrowser=ブラウザへ保存 @@ -63,10 +63,12 @@ deleteUsernameExistsMessage=そのユーザー名は存在しないため削除 # Pipeline # ############### pipeline.header=パイプラインメニュー (Alpha) -pipeline.uploadButton=Upload Custom +pipeline.uploadButton=カスタムのアップロード pipeline.configureButton=設定 pipeline.defaultOption=カスタム pipeline.submitButton=送信 +pipeline.help=パイプラインのヘルプ +pipeline.scanHelp=フォルダ スキャンのヘルプ ###################### # Pipeline Options # @@ -75,7 +77,7 @@ pipelineOptions.header=パイプライン設定 pipelineOptions.pipelineNameLabel=パイプライン名 pipelineOptions.saveSettings=動作設定の保存 pipelineOptions.pipelineNamePrompt=ここにパイプライン名を入力 -pipelineOptions.selectOperation=Select Operation +pipelineOptions.selectOperation=動作の選択 pipelineOptions.addOperationButton=動作の追加 pipelineOptions.pipelineHeader=パイプライン: pipelineOptions.saveButton=ダウンロード @@ -166,7 +168,7 @@ home.desc=PDFのあらゆるニーズに対応するローカルホスティン home.searchBar=機能検索... -home.viewPdf.title=View PDF +home.viewPdf.title=PDFを表示 home.viewPdf.desc=表示、注釈、テキストや画像の追加 viewPdf.tags=view,read,annotate,text,image @@ -454,6 +456,7 @@ pdfToSinglePage.submit=単一ページに変換 pageExtracter.title=ページの抽出 pageExtracter.header=ページの抽出 pageExtracter.submit=抽出 +pageExtracter.placeholder=(例:1,2,8、4,7,12-16、2n-1) #getPdfInfo @@ -540,7 +543,7 @@ addPageNumbers.selectText.5=番号をつけるページ addPageNumbers.selectText.6=カスタムテキスト addPageNumbers.customTextDesc=カスタムテキスト addPageNumbers.numberPagesDesc=番号をつけるページ、デフォルトは'all'、 1-5 や 2,5,9 など -addPageNumbers.customNumberDesc=デフォルトは{n}、'{n} ／ {total} ページ'、'テキスト-{n}'、'{filename}-{n}など +addPageNumbers.customNumberDesc=デフォルトは{n}、'{n} ／ {total} ページ'、'テキスト-{n}'、'{filename}-{n}など' addPageNumbers.submit=ページ番号の追加 @@ -756,6 +759,17 @@ merge.submit=結合 pdfOrganiser.title=整理 pdfOrganiser.header=PDFページの整理 pdfOrganiser.submit=ページの整理 +pdfOrganiser.mode=モード +pdfOrganiser.mode.1=カスタムページ順序 +pdfOrganiser.mode.2=逆順 +pdfOrganiser.mode.3=デュプレックスソート +pdfOrganiser.mode.4=小冊子ソート +pdfOrganiser.mode.5=サイドステッチ小冊子ソート +pdfOrganiser.mode.6=奇数-偶数分割 +pdfOrganiser.mode.7=最初に削除 +pdfOrganiser.mode.8=最後を削除 +pdfOrganiser.mode.9=最初と最後を削除 +pdfOrganiser.placeholder=(例:1,3,2または4-8,2,10-12または2n-1) #multiTool @@ -763,14 +777,15 @@ multiTool.title=PDFマルチツール multiTool.header=PDFマルチツール #view pdf -viewPdf.title=View PDF -viewPdf.header=View PDF +viewPdf.title=PDFを表示 +viewPdf.header=PDFを表示 #pageRemover pageRemover.title=ページ削除 pageRemover.header=PDFページ削除 pageRemover.pagesToDelete=削除するページ (ページ番号のカンマ区切りリストを入力してください): pageRemover.submit=ページ削除 +pageRemover.placeholder=(例:1,2,6または1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=不透明度 (0% - 100%): watermark.selectText.8=透かしの種類: watermark.selectText.9=透かしの画像: watermark.submit=透かしを追加 +watermark.type.1=テキスト +watermark.type.2=画像 #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDFをPDF/Aに変換 pdfToPDFA.header=PDFをPDF/Aに変換 pdfToPDFA.credit=本サービスはPDF/Aの変換にOCRmyPDFを使用しています。 pdfToPDFA.submit=変換 +pdfToPDFA.tip=現在、一度に複数の入力に対して機能しません #PDFToWord diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 4d9d153c..fc54a322 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=단일 페이지로 통합 pageExtracter.title=페이지 추출 pageExtracter.header=페이지 추출 pageExtracter.submit=추출 +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=병합 pdfOrganiser.title=페이지 정렬 pdfOrganiser.header=PDF 페이지 정렬 pdfOrganiser.submit=페이지 재정렬 +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=페이지 제거 pageRemover.header=PDF 페이지 제거 pageRemover.pagesToDelete=제거할 페이지 (쉼표로 구분된 페이지 번호 입력): pageRemover.submit=페이지 제거 +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=투명도 (0% - 100%): watermark.selectText.8=워터마크 유형: watermark.selectText.9=워터마크 이미지: watermark.submit=워터마크 추가 +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF To PDF/A pdfToPDFA.header=PDF 문서를 PDF/A로 변환 pdfToPDFA.credit=이 서비스는 PDF/A 변환을 위해 OCRmyPDF 문서를 사용합니다. pdfToPDFA.submit=변환 +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index 75db259b..e5ec206e 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Aangepast uploaden pipeline.configureButton=Configureren pipeline.defaultOption=Aangepast pipeline.submitButton=Opslaan +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Converteren naar enkele pagina pageExtracter.title=Pagina's extraheren pageExtracter.header=Pagina's extraheren pageExtracter.submit=Extraheren +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Samenvoegen pdfOrganiser.title=Pagina organisator pdfOrganiser.header=PDF pagina organisator pdfOrganiser.submit=Pagina's herschikken +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Pagina verwijderaar pageRemover.header=PDF pagina verwijderaar pageRemover.pagesToDelete=Te verwijderen pagina's (Voer een door komma's gescheiden lijst met paginanummers in): pageRemover.submit=Pagina's verwijderen +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Transparantie (0% - 100%): watermark.selectText.8=Type watermerk: watermark.selectText.9=Watermerk afbeelding: watermark.submit=Watermerk toevoegen +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF naar PDF/A pdfToPDFA.header=PDF naar PDF/A pdfToPDFA.credit=Deze service gebruikt OCRmyPDF voor PDF/A-conversie pdfToPDFA.submit=Converteren +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 54a41913..057e754d 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Połącz pdfOrganiser.title=Kolejność stron pdfOrganiser.header=Kolejność stron PDF pdfOrganiser.submit=Zmień kolejność stron +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Narzędzie do usuwania stron pageRemover.header=Narzędzie do usuwania stron w dokumentach PDF pageRemover.pagesToDelete=Strony do usunięcia (wprowadź listę numerów stron oddzielonych przecinkami): pageRemover.submit=Usuń strony +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Nieprzezroczystość (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Dodaj znak wodny +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF na PDF/A pdfToPDFA.header=PDF na PDF/A pdfToPDFA.credit=Ta usługa używa OCRmyPDF do konwersji PDF/A pdfToPDFA.submit=Konwertuj +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index 4e4ebfb6..8fe36f58 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Converter para Página Única pageExtracter.title=Extrair Páginas pageExtracter.header=Extrair Páginas pageExtracter.submit=Extrair +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Mesclar pdfOrganiser.title=Organizador de Páginas pdfOrganiser.header=Organizador de Páginas PDF pdfOrganiser.submit=Reorganizar Páginas +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Remover Página pageRemover.header=Remover Páginas do PDF pageRemover.pagesToDelete=Páginas a serem excluídas (insira uma lista separada por vírgulas de números de página): pageRemover.submit=Excluir Páginas +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacidade (0% - 100%) watermark.selectText.8=Tipo de Marca d'Água watermark.selectText.9=Imagem da Marca d'Água watermark.submit=Adicionar Marca d'Água +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF para PDF/A pdfToPDFA.header=PDF para PDF/A pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A pdfToPDFA.submit=Converter +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index 3ed85b8a..5cf3fce5 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Carregar personalizado pipeline.configureButton=Configurar pipeline.defaultOption=Personalizar pipeline.submitButton=Submeter +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Converter para Página Única pageExtracter.title=Extrair Páginas pageExtracter.header=Extrair Páginas pageExtracter.submit=Extrair +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Juntar pdfOrganiser.title=Organizador de Páginas pdfOrganiser.header=Organizador de Páginas PDF pdfOrganiser.submit=Reorganizar Páginas +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Remover Página pageRemover.header=Remover Páginas do PDF pageRemover.pagesToDelete=Páginas a serem excluídas (insira uma lista separada por vírgulas de números de página): pageRemover.submit=Excluir Páginas +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacidade (0% - 100%) watermark.selectText.8=Tipo de Marca d'Água watermark.selectText.9=Imagem da Marca d'Água watermark.submit=Adicionar Marca d'Água +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF para PDF/A pdfToPDFA.header=PDF para PDF/A pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A pdfToPDFA.submit=Converter +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 36208aa4..848f3daa 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Unire pdfOrganiser.title=Organizator de pagini pdfOrganiser.header=Organizator de pagini PDF pdfOrganiser.submit=Rearanjați paginile +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Înlăturare pagini pageRemover.header=Înlăturare pagini din PDF pageRemover.pagesToDelete=Pagini de șters (Introduceți o listă de numere de pagini separate prin virgulă): pageRemover.submit=Ștergere pagini +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacitate (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Adăugați Filigran +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF către PDF/A pdfToPDFA.header=PDF către PDF/A pdfToPDFA.credit=Acest serviciu utilizează OCRmyPDF pentru conversia în PDF/A pdfToPDFA.submit=Convert +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 085ea27b..9d4abc52 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Преобразовать в одну страницу pageExtracter.title=Извлечь страницы pageExtracter.header=Извлечь страницы pageExtracter.submit=Извлечь +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Объединить pdfOrganiser.title=Организатор страниц pdfOrganiser.header=Организатор PDF-страниц pdfOrganiser.submit=Переупорядочить страницы +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Удаление страниц pageRemover.header=Удаление PDF-страниц pageRemover.pagesToDelete=Страницы для удаления (введите список номеров страниц через запятую): pageRemover.submit=Удалить страницы +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Непрозрачность (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Добавить водяной знак +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF в PDF/A pdfToPDFA.header=PDF в PDF/A pdfToPDFA.credit=Этот сервис использует OCRmyPDF для преобразования PDF/A pdfToPDFA.submit=Конвертировать +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 2313910d..a40229be 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Postavi prilagođeno pipeline.configureButton=Konfiguriši pipeline.defaultOption=Prilagođeno pipeline.submitButton=Pošalji +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Konvertuj u Jednu Stranicu pageExtracter.title=Izdvajanje stranica pageExtracter.header=Izdvajanje stranica pageExtracter.submit=Izdvoji +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Spajanje pdfOrganiser.title=Organizator stranica pdfOrganiser.header=Organizator stranica u PDF-u pdfOrganiser.submit=Preuredi stranice +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Uklanjanje stranica pageRemover.header=Uklanjanje stranica iz PDF-a pageRemover.pagesToDelete=Stranice za brisanje (Unesite listu brojeva stranica odvojenih zarezima) : pageRemover.submit=Obriši stranice +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opačitost (0% - 100%): watermark.selectText.8=Tip vodenog žiga: watermark.selectText.9=Slika vodenog žiga: watermark.submit=Dodaj vodeni žig +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF u PDF/A pdfToPDFA.header=PDF u PDF/A pdfToPDFA.credit=Ova usluga koristi OCRmyPDF za konverziju u PDF/A format pdfToPDFA.submit=Konvertuj +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index f9d6000c..765cffe0 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Convert To Single Page pageExtracter.title=Extract Pages pageExtracter.header=Extract Pages pageExtracter.submit=Extract +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Slå samman pdfOrganiser.title=Sidorganisatör pdfOrganiser.header=PDF-sidorganisatör pdfOrganiser.submit=Ordna om sidor +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Sidborttagare pageRemover.header=PDF Sidborttagning pageRemover.pagesToDelete=Sidor att radera (Ange en kommaseparerad lista med sidnummer) : pageRemover.submit=Ta bort sidor +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opacitet (0% - 100%): watermark.selectText.8=Watermark Type: watermark.selectText.9=Watermark Image: watermark.submit=Lägg till vattenstämpel +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF till PDF/A pdfToPDFA.header=PDF till PDF/A pdfToPDFA.credit=Denna tjänst använder OCRmyPDF för PDF/A-konvertering pdfToPDFA.submit=Konvertera +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index fa26e617..370e4a62 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -67,6 +67,8 @@ pipeline.uploadButton=Upload Custom pipeline.configureButton=Configure pipeline.defaultOption=Custom pipeline.submitButton=Submit +pipeline.help=Pipeline Help +pipeline.scanHelp=Folder Scanning Help ###################### # Pipeline Options # @@ -454,6 +456,7 @@ pdfToSinglePage.submit=Tek Sayfaya Dönüştür pageExtracter.title=Sayfaları Çıkar pageExtracter.header=Sayfaları Çıkar pageExtracter.submit=Çıkar +pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1) #getPdfInfo @@ -756,6 +759,17 @@ merge.submit=Birleştir pdfOrganiser.title=Sayfa Organizatörü pdfOrganiser.header=PDF Sayfa Organizatörü pdfOrganiser.submit=Sayfaları Yeniden Düzenle +pdfOrganiser.mode=Mode +pdfOrganiser.mode.1=Custom Page Order +pdfOrganiser.mode.2=Reverse Order +pdfOrganiser.mode.3=Duplex Sort +pdfOrganiser.mode.4=Booklet Sort +pdfOrganiser.mode.5=Side Stitch Booklet Sort +pdfOrganiser.mode.6=Odd-Even Split +pdfOrganiser.mode.7=Remove First +pdfOrganiser.mode.8=Remove Last +pdfOrganiser.mode.9=Remove First and Last +pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) #multiTool @@ -771,6 +785,7 @@ pageRemover.title=Sayfa Silici pageRemover.header=PDF Sayfa silici pageRemover.pagesToDelete=Silinmesi gereken sayfalar (Virgülle ayrılmış sayfa numaraları listesi girin): pageRemover.submit=Sayfaları Sil +pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30) #rotate @@ -858,6 +873,8 @@ watermark.selectText.7=Opaklık (0% - 100%): watermark.selectText.8=Filigran Türü: watermark.selectText.9=Filigran Resmi: watermark.submit=Filigran Ekle +watermark.type.1=Text +watermark.type.2=Image #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=PDF'den PDF/A'ya pdfToPDFA.header=PDF'den PDF/A'ya pdfToPDFA.credit=Bu hizmet PDF/A dönüşümü için OCRmyPDF kullanır pdfToPDFA.submit=Dönüştür +pdfToPDFA.tip=Currently does not work for multiple inputs at once #PDFToWord diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index 9390ba7c..29cd62dd 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -11,18 +11,18 @@ imgPrompt=选择图像 genericSubmit=提交 processTimeWarning=警告：此过程可能需要多达一分钟，具体时间取决于文件大小 pageOrderPrompt=页面顺序（输入逗号分隔的页码列表）： -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=自定义页面选择（输入以逗号分隔的页码列表 1,5,6 或 2n+1 等函数）： goToPage=到 true=对 false=错 unknown=未知 save=保存 -saveToBrowser=Save to Browser +saveToBrowser=保存到浏览器 close=关闭 filesSelected=选中的文件 noFavourites=没有添加收藏夹 -downloadComplete=Download Complete -bored=无聊等待吗？ +downloadComplete=下载完成 +bored=等待时觉得无聊？ alphabet=字母表 downloadPdf=下载PDF text=文本 @@ -32,54 +32,56 @@ pageNum=页码 sizes.small=小型尺寸 sizes.medium=中型尺寸 sizes.large=大型尺寸 -sizes.x-large=稍大型尺寸 +sizes.x-large=超大型尺寸 error.pdfPassword=PDF 文档有密码，未提供密码或密码不正确 delete=删除 username=用户名 password=密码 welcome=欢迎 property=资产 -black=Black -white=White -red=Red -green=Green -blue=Blue -custom=Custom... -WorkInProgess=Work in progress, May not work or be buggy, Please report any problems! +black=黑色 +white=白色 +red=红色 +green=绿色 +blue=蓝色 +custom=自定义... +WorkInProgess=工作正在进行中，可能无法工作或有错误，请报告任何问题！ poweredBy=Powered by -yes=Yes -no=No +yes=是 +no=否 changedCredsMessage=凭证已更改！ notAuthenticatedMessage=用户未经过身份验证。 userNotFoundMessage=未找到用户。 incorrectPasswordMessage=当前密码不正确。 usernameExistsMessage=新用户名已存在。 -invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. -deleteCurrentUserMessage=Cannot delete currently logged in user. -deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +invalidUsernameMessage=用户名无效，用户名只能由字母字符和数字组成。 +deleteCurrentUserMessage=无法删除当前登录的用户。 +deleteUsernameExistsMessage=用户名不存在，无法删除。 ############### # Pipeline # ############### -pipeline.header=Pipeline Menu (Beta) -pipeline.uploadButton=Upload Custom -pipeline.configureButton=Configure -pipeline.defaultOption=Custom -pipeline.submitButton=Submit +pipeline.header=流水线菜单 (Beta) +pipeline.uploadButton=上传自定义流水线 +pipeline.configureButton=配置 +pipeline.defaultOption=自定义 +pipeline.submitButton=提交 +pipeline.help=工作流帮助 +pipeline.scanHelp=文件夹扫描帮助 ###################### # Pipeline Options # ###################### -pipelineOptions.header=Pipeline Configuration -pipelineOptions.pipelineNameLabel=Pipeline Name -pipelineOptions.saveSettings=Save Operation Settings -pipelineOptions.pipelineNamePrompt=Enter pipeline name here -pipelineOptions.selectOperation=Select Operation -pipelineOptions.addOperationButton=Add operation -pipelineOptions.pipelineHeader=Pipeline: -pipelineOptions.saveButton=Download -pipelineOptions.validateButton=Validate +pipelineOptions.header=流水线配置 +pipelineOptions.pipelineNameLabel=流水线名称 +pipelineOptions.saveSettings=保存设置 +pipelineOptions.pipelineNamePrompt=请输入流水线名称 +pipelineOptions.selectOperation=选择操作 +pipelineOptions.addOperationButton=添加操作 +pipelineOptions.pipelineHeader=流水线: +pipelineOptions.saveButton=下载 +pipelineOptions.validateButton=验证 @@ -112,7 +114,7 @@ settings.accountSettings=帐号设定 changeCreds.title=更改凭证 changeCreds.header=更新您的账户详情 -changeCreds.changePassword=You are using default login credentials. Please enter a new password +changeCreds.changePassword=您正在使用默认登录凭证，请输入新密码 changeCreds.newUsername=新用户名 changeCreds.oldPassword=当前密码 changeCreds.newPassword=新密码 @@ -147,22 +149,22 @@ adminUserSettings.header=管理员用户控制设置 adminUserSettings.admin=管理员 adminUserSettings.user=用户 adminUserSettings.addUser=添加新用户 -adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters. +adminUserSettings.usernameInfo=用户名只能由字母和数字组成，不能包含空格或特殊字符。 adminUserSettings.roles=角色 adminUserSettings.role=角色 adminUserSettings.actions=操作 -adminUserSettings.apiUser=有限 API 用户 -adminUserSettings.extraApiUser=Additional Limited API User +adminUserSettings.apiUser=受限制的 API 用户 +adminUserSettings.extraApiUser=额外受限制的 API 用户 adminUserSettings.webOnlyUser=仅限 Web 用户 -adminUserSettings.demoUser=Demo User (No custom settings) -adminUserSettings.internalApiUser=Internal API User +adminUserSettings.demoUser=演示用户(无自定义设置) +adminUserSettings.internalApiUser=内部API用户 adminUserSettings.forceChange=强制用户在登录时更改用户名/密码 adminUserSettings.submit=保存用户 ############# # HOME-PAGE # ############# -home.desc=CZL一站式服务，满足您的所有PDF需求。 +home.desc=本地部署的一站式服务，满足您的所有PDF需求。 home.searchBar=搜索您需要的功能... @@ -236,7 +238,7 @@ changeMetadata.tags=标题、作者、日期、创建、时间、发布者、制 home.fileToPDF.title=将文件转换为PDF文件 home.fileToPDF.desc=将几乎所有文件转换为PDF（DOCX、PNG、XLS、PPT、TXT等）。 -fileToPDF.tags=转换、格式、文档、图片、幻灯片、文本、转换、办公室、文档、Word、Excel、PowerPoint +fileToPDF.tags=转换、格式、文档、图片、幻灯片、文本、转换、Office、Docs、Word、Excel、PowerPoint home.ocr.title=运行OCR/清理扫描 home.ocr.desc=清理和识别PDF中的图像文本，并将其转换为可编辑文本。 @@ -247,17 +249,17 @@ home.extractImages.title=提取图像 home.extractImages.desc=从PDF中提取所有图像并保存到压缩包中。 extractImages.tags=图片、照片、保存、归档、压缩包、截取、抓取 -home.pdfToPDFA.title=PDF To PDF/A +home.pdfToPDFA.title=PDF转PDF/A home.pdfToPDFA.desc=将PDF转换为PDF/A以进行长期保存。 pdfToPDFA.tags=归档、长期、标准、转换、存储、保存 home.PDFToWord.title=PDF转Word home.PDFToWord.desc=将PDF转换为Word格式（DOC、DOCX和ODT）。 -PDFToWord.tags=doc、docx、odt、word、转换、格式、办公、Microsoft、文档 +PDFToWord.tags=doc、docx、odt、word、转换、格式、Office、Microsoft、文档 home.PDFToPresentation.title=PDF转演示文稿 home.PDFToPresentation.desc=将PDF转换为演示文稿格式（PPT、PPTX和ODP）。 -PDFToPresentation.tags=幻灯片、展示、办公、Microsoft +PDFToPresentation.tags=幻灯片、展示、Office、Microsoft home.PDFToText.title=PDF转RTF（文本） home.PDFToText.desc=将PDF转换为文本或RTF格式。 @@ -276,7 +278,7 @@ home.ScannerImageSplit.title=检测/分割扫描图像 home.ScannerImageSplit.desc=从一张照片或PDF中分割出多张照片。 ScannerImageSplit.tags=分离、自动检测、扫描、多张照片、整理 -home.sign.title=标志 +home.sign.title=签名 home.sign.desc=通过绘图、文字或图像向PDF添加签名 sign.tags=授权、缩写、手绘签名、文本签名、图像签名 @@ -312,8 +314,8 @@ home.scalePages.title=调整页面尺寸/缩放 home.scalePages.desc=调整页面及/或其内容的尺寸/缩放 scalePages.tags=调整大小、修改、尺寸、适应 -home.pipeline.title=管道（高级版） -home.pipeline.desc=通过定义管道脚本在PDF上运行多个操作 +home.pipeline.title=流水线（高级版） +home.pipeline.desc=通过定义流水线脚本在PDF上运行多个操作 pipeline.tags=自动化、顺序、脚本化、批处理 home.add-page-numbers.title=添加页码 @@ -375,9 +377,9 @@ showJS.tags=JavaScript home.autoRedact.title=自动删除 home.autoRedact.desc=根据输入文本自动删除（覆盖）PDF中的文本 -autoRedact.tags=Redact,Hide,black out,black,marker,hidden +autoRedact.tags=脱敏、隐藏、涂黑、标记、不可见 -home.tableExtraxt.title=PDF to CSV +home.tableExtraxt.title=PDF转CSV home.tableExtraxt.desc=从PDF中提取表格并将其转换为CSV tableExtraxt.tags=CSV、表格提取、提取、转换 @@ -395,18 +397,18 @@ home.split-by-sections.title=拆分PDF成小块 home.split-by-sections.desc=将PDF的每一页分割成更小的水平和垂直的部分 split-by-sections.tags=章节拆分、分割、自定义 -home.AddStampRequest.title=Add Stamp to PDF -home.AddStampRequest.desc=Add text or add image stamps at set locations -AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.AddStampRequest.title=添加图章 +home.AddStampRequest.desc=在指定位置添加文本或图片图章 +AddStampRequest.tags=图章、添加图片、图片居中、水印、PDF、嵌入、自定义 -home.PDFToBook.title=PDF to Book -home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre -PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.PDFToBook.title=PDF转电子书 +home.PDFToBook.desc=使用Calibre将PDF转换成电子书/漫画 +PDFToBook.tags=电子书、漫画、Calibre、转换、日本漫画、亚马逊、kindle -home.BookToPDF.title=Book to PDF -home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre -BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.BookToPDF.title=电子书转PDF +home.BookToPDF.desc=使用Calibre将电子书/漫画转换成PDF +BookToPDF.tags=电子书、漫画、Calibre、转换、日本漫画、亚马逊、kindle ########################### @@ -454,6 +456,7 @@ pdfToSinglePage.submit=转为单页 pageExtracter.title=提取页面 pageExtracter.header=提取页面 pageExtracter.submit=提取 +pageExtracter.placeholder=（例如 1,2,8 或 4,7,12-16 或 2n-1） #getPdfInfo @@ -468,7 +471,7 @@ MarkdownToPDF.title=Markdown转PDF MarkdownToPDF.header=Markdown转PDF MarkdownToPDF.submit=转换 MarkdownToPDF.help=正在努力中 -MarkdownToPDF.credit=使用WeasyPrint +MarkdownToPDF.credit=此服务使用WeasyPrint进行文件转换。 @@ -476,7 +479,7 @@ MarkdownToPDF.credit=使用WeasyPrint URLToPDF.title=URL转PDF URLToPDF.header=URL转PDF URLToPDF.submit=转换 -URLToPDF.credit=使用WeasyPrint +URLToPDF.credit=此服务使用WeasyPrint进行文件转换。 #html-to-pdf @@ -484,38 +487,38 @@ HTMLToPDF.title=HTML转PDF HTMLToPDF.header=HTML转PDF HTMLToPDF.help=接受HTML文件和包含所需的html/css/images等的ZIP文件 HTMLToPDF.submit=转换 -HTMLToPDF.credit=使用WeasyPrint -HTMLToPDF.zoom=Zoom level for displaying the website. -HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default) -HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default) -HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default) -HTMLToPDF.printBackground=Render the background of websites. -HTMLToPDF.defaultHeader=Enable Default Header (Name and page number) -HTMLToPDF.cssMediaType=Change the CSS media type of the page. -HTMLToPDF.none=None -HTMLToPDF.print=Print -HTMLToPDF.screen=Screen +HTMLToPDF.credit=此服务使用WeasyPrint进行文件转换。 +HTMLToPDF.zoom=网站显示缩放级别 +HTMLToPDF.pageWidth=页面宽度-以厘米为单位（填空则使用默认值） +HTMLToPDF.pageHeight=页面高度-以厘米为单位（填空则使用默认值） +HTMLToPDF.marginTop=页面上边距-以毫米为单位（填空则使用默认值） +HTMLToPDF.marginBottom=页面下边距-以毫米为单位（填空则使用默认值） +HTMLToPDF.marginLeft=页面左上边距-以毫米为单位（填空则使用默认值） +HTMLToPDF.marginRight=页面右边距-以毫米为单位（填空则使用默认值） +HTMLToPDF.printBackground=页面背景渲染 +HTMLToPDF.defaultHeader=启用默认页头（文件名称和页码） +HTMLToPDF.cssMediaType=更换页面的CSS media type. +HTMLToPDF.none=无 +HTMLToPDF.print=打印 +HTMLToPDF.screen=屏幕 #AddStampRequest -AddStampRequest.header=Stamp PDF -AddStampRequest.title=Stamp PDF -AddStampRequest.stampType=Stamp Type -AddStampRequest.stampText=Stamp Text -AddStampRequest.stampImage=Stamp Image -AddStampRequest.alphabet=Alphabet -AddStampRequest.fontSize=Font/Image Size -AddStampRequest.rotation=Rotation -AddStampRequest.opacity=Opacity -AddStampRequest.position=Position -AddStampRequest.overrideX=Override X Coordinate -AddStampRequest.overrideY=Override Y Coordinate -AddStampRequest.customMargin=Custom Margin -AddStampRequest.customColor=Custom Text Color -AddStampRequest.submit=Submit +AddStampRequest.header=添加图章 +AddStampRequest.title=添加图章 +AddStampRequest.stampType=图章类型 +AddStampRequest.stampText=图章文字 +AddStampRequest.stampImage=图章图片 +AddStampRequest.alphabet=字母表 +AddStampRequest.fontSize=字体/图片大小 +AddStampRequest.rotation=旋转角度 +AddStampRequest.opacity=透明度 +AddStampRequest.position=定位 +AddStampRequest.overrideX=覆盖 X 坐标 +AddStampRequest.overrideY=覆盖 Y 坐标 +AddStampRequest.customMargin=自定义外边距 +AddStampRequest.customColor=自定义文本颜色 +AddStampRequest.submit=提交 #sanitizePDF @@ -604,11 +607,11 @@ scalePages.submit=提交 certSign.title=证书签名 certSign.header=使用您的证书签署 PDF（进行中） certSign.selectPDF=选择要签名的 PDF 文件： -certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below. +certSign.jksNote=注意：如果您的证书类型未在下面列出，请使用 keytool 命令行工具将其转换为 Java Keystore (.jks) 文件。 然后，选择下面的 .jks 文件选项。 certSign.selectKey=选择您的私钥文件（PKCS#8 格式，可以是 .pem 或 .der）： certSign.selectCert=选择您的证书文件（X.509 格式，可以是 .pem 或 .der）： certSign.selectP12=选择您的 PKCS#12 密钥库文件（.p12 或 .pfx）（可选，如果提供，它应该包含您的私钥和证书）： -certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore): +certSign.selectJKS=选择你的 Java Keystore 文件 (.jks 或 .keystore): certSign.certType=证书类型 certSign.password=输入您的密钥库或私钥密码（如果有）： certSign.showSig=显示签名 @@ -629,9 +632,9 @@ removeBlanks.submit=删除空白 #removeAnnotations -removeAnnotations.title=Remove Annotations -removeAnnotations.header=Remove Annotations -removeAnnotations.submit=Remove +removeAnnotations.title=删除标注 +removeAnnotations.header=删除标注 +removeAnnotations.submit=删除 #compare @@ -642,17 +645,17 @@ compare.document.2=文档 2 compare.submit=比较 #BookToPDF -BookToPDF.title=Books and Comics to PDF -BookToPDF.header=Book to PDF -BookToPDF.credit=Uses Calibre -BookToPDF.submit=Convert +BookToPDF.title=电子书和漫画转换成PDF +BookToPDF.header=电子书转PDF +BookToPDF.credit=此服务使用Calibre进行文件转换。 +BookToPDF.submit=转换 #PDFToBook -PDFToBook.title=PDF to Book -PDFToBook.header=PDF to Book -PDFToBook.selectText.1=Format -PDFToBook.credit=Uses Calibre -PDFToBook.submit=Convert +PDFToBook.title=PDF转电子书 +PDFToBook.header=PDF转电子书 +PDFToBook.selectText.1=格式 +PDFToBook.credit=此服务使用Calibre进行文件转换。 +PDFToBook.submit=转换 #sign sign.title=签名 @@ -719,7 +722,7 @@ extractImages.submit=提取 #File to PDF fileToPDF.title=文件转换为PDF fileToPDF.header=将任何文件转换为PDF。 -fileToPDF.credit=本服务使用LibreOffice和Unoconv进行文件转换。 +fileToPDF.credit=此服务使用LibreOffice和Unoconv进行文件转换。 fileToPDF.supportedFileTypes=支持的文件类型应该包括以下几种，但是，对于支持的格式的完整更新列表，请参考LibreOffice文档。 fileToPDF.submit=转换为 PDF @@ -738,7 +741,7 @@ compress.submit=压缩 #Add image addImage.title=添加图像 -addImage.header=添加图片到PDF（正在进行中） +addImage.header=添加图片到PDF addImage.everyPage=每一页？ addImage.upload=添加图片 addImage.submit=添加图片 @@ -756,6 +759,17 @@ merge.submit=合并 pdfOrganiser.title=页面排序 pdfOrganiser.header=PDF页面排序 pdfOrganiser.submit=重新排列页面 +pdfOrganiser.mode=模式 +pdfOrganiser.mode.1=自定义页面顺序 +pdfOrganiser.mode.2=反向顺序 +pdfOrganiser.mode.3=双面排序 +pdfOrganiser.mode.4=小册子排序 +pdfOrganiser.mode.5=侧装订小册子排序 +pdfOrganiser.mode.6=奇偶拆分 +pdfOrganiser.mode.7=删除第一页 +pdfOrganiser.mode.8=删除最后一页 +pdfOrganiser.mode.9=删除第一页和最后一页 +pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1） #multiTool @@ -763,14 +777,15 @@ multiTool.title=PDF多功能工具 multiTool.header=PDF多功能工具 #view pdf -viewPdf.title=View PDF -viewPdf.header=View PDF +viewPdf.title=浏览PDF +viewPdf.header=浏览PDF #pageRemover pageRemover.title=删除页面 pageRemover.header=PDF页面移除器 pageRemover.pagesToDelete=要删除的页面（输入一个用逗号分隔的页码列表）： pageRemover.submit=删除页面 +pageRemover.placeholder=（例如 1,2,6 或 1-10,15-30） #rotate @@ -810,7 +825,7 @@ imageToPDF.selectText.5=转换为独立的PDF文件 #pdfToImage -pdfToImage.title=PDF to Image +pdfToImage.title=PDF转图片 pdfToImage.header=PDF转图片 pdfToImage.selectText=图像格式 pdfToImage.singleOrMultiple=图像结果类型 @@ -858,6 +873,8 @@ watermark.selectText.7=透明度（0% - 100%）： watermark.selectText.8=水印类型： watermark.selectText.9=水印图片： watermark.submit=添加水印 +watermark.type.1=文字 +watermark.type.2=图片 #Change permissions @@ -909,6 +926,7 @@ pdfToPDFA.title=将PDF转换为PDF/A pdfToPDFA.header=PDF转换为PDF/A pdfToPDFA.credit=此服务使用OCRmyPDF进行PDF/A转换 pdfToPDFA.submit=转换 +pdfToPDFA.tip=目前不支持上传多个 #PDFToWord @@ -923,7 +941,7 @@ PDFToWord.submit=转换 PDFToPresentation.title=PDF转换为演示文稿 PDFToPresentation.header=将PDF转为演示文稿 PDFToPresentation.selectText.1=输出文件格式 -PDFToPresentation.credit=该服务使用LibreOffice进行文件转换。 +PDFToPresentation.credit=此服务使用LibreOffice进行文件转换。 PDFToPresentation.submit=转换 @@ -931,7 +949,7 @@ PDFToPresentation.submit=转换 PDFToText.title=PDF to RTF (Text) PDFToText.header=将PDF转换成文本/RTF PDFToText.selectText.1=输出文件格式 -PDFToText.credit=该服务使用LibreOffice进行文件转换。 +PDFToText.credit=此服务使用LibreOffice进行文件转换。 PDFToText.submit=转换 @@ -993,11 +1011,11 @@ split-by-sections.submit=分割PDF split-by-sections.merge=是否合并为一个pdf #licenses -licenses.nav=Licenses -licenses.title=3rd Party Licenses -licenses.header=3rd Party Licenses -licenses.module=Module -licenses.version=Version -licenses.license=License +licenses.nav=许可证 +licenses.title=第三方许可证 +licenses.header=第三方许可证 +licenses.module=模块 +licenses.version=版本 +licenses.license=许可证 diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 721f46b5..2093bc0d 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -11,17 +11,17 @@ imgPrompt=選擇圖片 genericSubmit=送出 processTimeWarning=警告：此過程可能需要長達一分鐘，具體取決於檔案大小 pageOrderPrompt=自訂頁面順序（輸入以逗號分隔的頁碼或函式，如 2n+1）： -pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) : +pageSelectionPrompt=自訂頁面選擇（輸入以逗號分隔的頁碼 1、5、6 或 2n+1 等函數的清單）： goToPage=前往 true=是 false=否 unknown=未知 save=儲存 -saveToBrowser=Save to Browser +saveToBrowser=儲存到瀏覽器 close=關閉 filesSelected=已選擇的檔案 noFavourites=未新增收藏 -downloadComplete=Download Complete +downloadComplete=下載完成 bored=等待時覺得無聊？ alphabet=字母表 downloadPdf=下載 PDF @@ -45,41 +45,43 @@ red=紅色 green=綠色 blue=藍色 custom=自訂... -WorkInProgess=Work in progress, May not work or be buggy, Please report any problems! +WorkInProgess=工作正在進行中，可能無法工作或有問題，請報告任何問題！ poweredBy=Powered by -yes=Yes -no=No +yes=是 +no=否 changedCredsMessage=憑證已變更！ notAuthenticatedMessage=使用者未認證。 userNotFoundMessage=找不到使用者。 incorrectPasswordMessage=目前密碼不正確。 usernameExistsMessage=新使用者名稱已存在。 -invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. -deleteCurrentUserMessage=Cannot delete currently logged in user. -deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +invalidUsernameMessage=使用者名無效，使用者名只能包含字母字元和數位。 +deleteCurrentUserMessage=無法刪除目前登錄的使用者。 +deleteUsernameExistsMessage=使用者名不存在，無法刪除。 ############### # Pipeline # ############### -pipeline.header=Pipeline Menu (Beta) -pipeline.uploadButton=Upload Custom -pipeline.configureButton=Configure -pipeline.defaultOption=Custom -pipeline.submitButton=Submit +pipeline.header=管道選單（測試版） +pipeline.uploadButton=上傳自定義 +pipeline.configureButton=配置 +pipeline.defaultOption=自訂 +pipeline.submitButton=送出 +pipeline.help=管道説明 +pipeline.scanHelp=資料夾掃描説明 ###################### # Pipeline Options # ###################### -pipelineOptions.header=Pipeline Configuration -pipelineOptions.pipelineNameLabel=Pipeline Name -pipelineOptions.saveSettings=Save Operation Settings -pipelineOptions.pipelineNamePrompt=Enter pipeline name here -pipelineOptions.selectOperation=Select Operation -pipelineOptions.addOperationButton=Add operation -pipelineOptions.pipelineHeader=Pipeline: -pipelineOptions.saveButton=Download -pipelineOptions.validateButton=Validate +pipelineOptions.header=管道配置 +pipelineOptions.pipelineNameLabel=管道名稱 +pipelineOptions.saveSettings=保存操作設置 +pipelineOptions.pipelineNamePrompt=在此處輸入管道名稱 +pipelineOptions.selectOperation=選擇操作 +pipelineOptions.addOperationButton=添加操作 +pipelineOptions.pipelineHeader=管道： +pipelineOptions.saveButton=下載 +pipelineOptions.validateButton=驗證 @@ -112,7 +114,7 @@ settings.accountSettings=帳戶設定 changeCreds.title=變更憑證 changeCreds.header=更新您的帳戶詳細資訊 -changeCreds.changePassword=You are using default login credentials. Please enter a new password +changeCreds.changePassword=您使用的是預設登錄認證。請輸入新密碼 changeCreds.newUsername=新使用者名稱 changeCreds.oldPassword=目前密碼 changeCreds.newPassword=新密碼 @@ -147,15 +149,15 @@ adminUserSettings.header=管理使用者控制設定 adminUserSettings.admin=管理員 adminUserSettings.user=使用者 adminUserSettings.addUser=新增使用者 -adminUserSettings.usernameInfo=Username must only contain letters and numbers, no spaces or special characters. +adminUserSettings.usernameInfo=使用者名只能包含字母和數位，不能包含空格或特殊字元。 adminUserSettings.roles=角色 adminUserSettings.role=角色 adminUserSettings.actions=操作 adminUserSettings.apiUser=受限制的 API 使用者 -adminUserSettings.extraApiUser=Additional Limited API User +adminUserSettings.extraApiUser=其他受限 API 使用者 adminUserSettings.webOnlyUser=僅使用網頁的使用者 adminUserSettings.demoUser=示範用途的使用者（無自訂設定） -adminUserSettings.internalApiUser=Internal API User +adminUserSettings.internalApiUser=內部 API 使用者 adminUserSettings.forceChange=強制使用者在登入時修改使用者名稱/密碼 adminUserSettings.submit=儲存 @@ -395,18 +397,18 @@ home.split-by-sections.title=依區段分割 PDF home.split-by-sections.desc=將 PDF 的每一頁分割為較小的水平和垂直區段 split-by-sections.tags=區段分割, 劃分, 自訂 -home.AddStampRequest.title=Add Stamp to PDF -home.AddStampRequest.desc=Add text or add image stamps at set locations -AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize +home.AddStampRequest.title=將圖章添加到 PDF +home.AddStampRequest.desc=在設置位置添加文字或添加圖像圖章 +AddStampRequest.tags=圖章,添加圖片,中心圖像,浮水印,PDF,嵌入,自訂 -home.PDFToBook.title=PDF to Book -home.PDFToBook.desc=Converts PDF to Book/Comic formats using calibre -PDFToBook.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.PDFToBook.title=PDF 轉電子書 +home.PDFToBook.desc=使用 calibre 將 PDF 轉換為書籍/漫畫格式 +PDFToBook.tags=電子書,漫畫,Calibre,轉換,日本漫畫,亞馬遜,kindle -home.BookToPDF.title=Book to PDF -home.BookToPDF.desc=Converts Books/Comics formats to PDF using calibre -BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle +home.BookToPDF.title=電子書轉 PDF +home.BookToPDF.desc=使用 calibre 將書籍/漫畫格式轉換為 PDF +BookToPDF.tags=電子書,漫畫,Calibre,轉換,日本漫畫,亞馬遜,kindle ########################### @@ -454,6 +456,7 @@ pdfToSinglePage.submit=轉換為單一頁面 pageExtracter.title=提取頁面 pageExtracter.header=提取頁面 pageExtracter.submit=提取 +pageExtracter.placeholder=（例如 1,2,8 或 4,7,12-16 或 2n-1） #getPdfInfo @@ -468,7 +471,7 @@ MarkdownToPDF.title=Markdown 轉 PDF MarkdownToPDF.header=Markdown 轉 PDF MarkdownToPDF.submit=轉換 MarkdownToPDF.help=正在進行中 -MarkdownToPDF.credit=使用 WeasyPrint +MarkdownToPDF.credit=此服務使用 WeasyPrint 進行轉換 @@ -476,7 +479,7 @@ MarkdownToPDF.credit=使用 WeasyPrint URLToPDF.title=URL 轉 PDF URLToPDF.header=URL 轉 PDF URLToPDF.submit=轉換 -URLToPDF.credit=使用 WeasyPrint +URLToPDF.credit=此服務使用 WeasyPrint 進行轉換 #html-to-pdf @@ -484,38 +487,38 @@ HTMLToPDF.title=HTML 轉 PDF HTMLToPDF.header=HTML 轉 PDF HTMLToPDF.help=接受 HTML 文件和包含所需 html/css/images 等的 ZIP HTMLToPDF.submit=轉換 -HTMLToPDF.credit=使用 WeasyPrint -HTMLToPDF.zoom=Zoom level for displaying the website. -HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default) -HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default) -HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default) -HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default) -HTMLToPDF.printBackground=Render the background of websites. -HTMLToPDF.defaultHeader=Enable Default Header (Name and page number) -HTMLToPDF.cssMediaType=Change the CSS media type of the page. -HTMLToPDF.none=None -HTMLToPDF.print=Print -HTMLToPDF.screen=Screen +HTMLToPDF.credit=此服務使用 WeasyPrint 進行轉換 +HTMLToPDF.zoom=用於顯示網站的縮放級別。 +HTMLToPDF.pageWidth=頁面寬度-以釐米為單位（填空則使用預設值） +HTMLToPDF.pageHeight=頁面高度-以釐米為單位（填空則使用預設值） +HTMLToPDF.marginTop=頁面的上邊距-以毫米為單位（填空則使用預設值） +HTMLToPDF.marginBottom=頁面的下邊距-以毫米為單位（填空則使用預設值） +HTMLToPDF.marginLeft=頁面的左邊距-以毫米為單位（填空則使用預設值） +HTMLToPDF.marginRight=頁面的右邊距-以毫米為單位（填空則使用預設值） +HTMLToPDF.printBackground=渲染網站的背景。 +HTMLToPDF.defaultHeader=啟用預設標頭（名稱和頁碼） +HTMLToPDF.cssMediaType=更改頁面的 CSS 媒體類型。 +HTMLToPDF.none=無 +HTMLToPDF.print=列印 +HTMLToPDF.screen=螢幕 #AddStampRequest -AddStampRequest.header=Stamp PDF -AddStampRequest.title=Stamp PDF -AddStampRequest.stampType=Stamp Type -AddStampRequest.stampText=Stamp Text -AddStampRequest.stampImage=Stamp Image -AddStampRequest.alphabet=Alphabet -AddStampRequest.fontSize=Font/Image Size -AddStampRequest.rotation=Rotation -AddStampRequest.opacity=Opacity -AddStampRequest.position=Position -AddStampRequest.overrideX=Override X Coordinate -AddStampRequest.overrideY=Override Y Coordinate -AddStampRequest.customMargin=Custom Margin -AddStampRequest.customColor=Custom Text Color -AddStampRequest.submit=Submit +AddStampRequest.header=圖章 PDF +AddStampRequest.title=圖章 PDF +AddStampRequest.stampType=圖章類型 +AddStampRequest.stampText=圖章文字 +AddStampRequest.stampImage=圖章圖片 +AddStampRequest.alphabet=字母表 +AddStampRequest.fontSize=字體/圖像大小 +AddStampRequest.rotation=旋轉 +AddStampRequest.opacity=透明度 +AddStampRequest.position=位置 +AddStampRequest.overrideX=覆蓋 X 座標 +AddStampRequest.overrideY=覆蓋 Y 座標 +AddStampRequest.customMargin=自訂邊緣 +AddStampRequest.customColor=自訂文字顏色 +AddStampRequest.submit=送出 #sanitizePDF @@ -540,7 +543,7 @@ addPageNumbers.selectText.5=要編號的頁面 addPageNumbers.selectText.6=自訂文字 addPageNumbers.customTextDesc=自訂文字 addPageNumbers.numberPagesDesc=要編號的頁面，預設為 '全部'，也可使用 1-5 或 2,5,9 等格式 -addPageNumbers.customNumberDesc=預設為 {n}，也接受 '頁面 {n} 共 {total}'，'文字-{n}'，'{filename}-{n} +addPageNumbers.customNumberDesc=預設為 {n}，也接受 '頁面 {n} 共 {total}'，'文字-{n}'，'{filename}-{n}' addPageNumbers.submit=新增頁碼 @@ -604,11 +607,11 @@ scalePages.submit=送出 certSign.title=憑證簽章 certSign.header=使用您的憑證簽章（進行中） certSign.selectPDF=選擇要簽章的 PDF 檔案： -certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below. +certSign.jksNote=注意：如果您的證書類型未在下面列出，請使用keytool命令行工具將其轉換為Java Keystore （.jks） 檔。 然後，選擇下面的 .jks 文件選項。 certSign.selectKey=選擇您的私鑰文件（PKCS#8 格式，可能是 .pem 或 .der）： certSign.selectCert=選擇您的憑證文件（X.509 格式，可能是 .pem 或 .der）： certSign.selectP12=選擇您的 PKCS#12 金鑰庫文件（.p12 或 .pfx）（可選，如果提供，它應包含您的私鑰和憑證）： -certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore): +certSign.selectJKS=選擇你的 Java Keystore 檔 （.jks 或 .keystore）： certSign.certType=憑證類型 certSign.password=輸入您的金鑰庫或私鑰密碼（如果有）： certSign.showSig=顯示簽章 @@ -642,17 +645,17 @@ compare.document.2=文件 2 compare.submit=比較 #BookToPDF -BookToPDF.title=Books and Comics to PDF -BookToPDF.header=Book to PDF -BookToPDF.credit=Uses Calibre -BookToPDF.submit=Convert +BookToPDF.title=電子書和漫畫轉 PDF +BookToPDF.header=電子書轉 PDF +BookToPDF.credit=此服務使用 Calibre 進行轉換 +BookToPDF.submit=轉換 #PDFToBook -PDFToBook.title=PDF to Book -PDFToBook.header=PDF to Book -PDFToBook.selectText.1=Format -PDFToBook.credit=Uses Calibre -PDFToBook.submit=Convert +PDFToBook.title=PDF 轉電子書 +PDFToBook.header=PDF 轉電子書 +PDFToBook.selectText.1=格式 +PDFToBook.credit=此服務使用 Calibre 進行轉換 +PDFToBook.submit=轉換 #sign sign.title=簽章 @@ -756,6 +759,17 @@ merge.submit=合併 pdfOrganiser.title=頁面整理 pdfOrganiser.header=PDF 頁面整理 pdfOrganiser.submit=重新排列頁面 +pdfOrganiser.mode=模式 +pdfOrganiser.mode.1=自定義頁面順序 +pdfOrganiser.mode.2=反向順序 +pdfOrganiser.mode.3=雙工排序 +pdfOrganiser.mode.4=摺頁冊排序 +pdfOrganiser.mode.5=側裝訂摺頁冊排序 +pdfOrganiser.mode.6=奇偶拆分 +pdfOrganiser.mode.7=刪除第一頁 +pdfOrganiser.mode.8=刪除最後一頁 +pdfOrganiser.mode.9=刪除第一頁和最後一頁 +pdfOrganiser.placeholder=（例如 1,3,2 或 4-8,2,10-12 或 2n-1） #multiTool @@ -771,7 +785,7 @@ pageRemover.title=頁面移除 pageRemover.header=PDF 頁面移除 pageRemover.pagesToDelete=要刪除的頁面（輸入以逗號分隔的頁碼）： pageRemover.submit=刪除頁面 - +pageRemover.placeholder=（例如 1,2,6 或 1-10,15-30） #rotate rotate.title=旋轉 PDF @@ -858,6 +872,8 @@ watermark.selectText.7=不透明度（0% - 100%）： watermark.selectText.8=浮水印類型： watermark.selectText.9=浮水印影像： watermark.submit=新增浮水印 +watermark.type.1=文字 +watermark.type.2=圖片 #Change permissions @@ -909,6 +925,7 @@ pdfToPDFA.title=PDF 轉 PDF/A pdfToPDFA.header=PDF 轉 PDF/A pdfToPDFA.credit=此服務使用 OCRmyPDF 進行 PDF/A 轉換 pdfToPDFA.submit=轉換 +pdfToPDFA.tip=目前不支援上傳多個 #PDFToWord @@ -993,11 +1010,11 @@ split-by-sections.submit=分割 PDF split-by-sections.merge=是否合併為一個pdf #licenses -licenses.nav=Licenses -licenses.title=3rd Party Licenses -licenses.header=3rd Party Licenses -licenses.module=Module -licenses.version=Version -licenses.license=License +licenses.nav=許可證 +licenses.title=第三方許可證 +licenses.header=第三方許可證 +licenses.module=模組 +licenses.version=版本 +licenses.license=許可證 diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index e9b8ac88..6494cf9c 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -14,7 +14,7 @@

      -

      Currently doesn't work for multiple inputs at once

      +


      diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html index c10485b8..9d97b3b4 100644 --- a/src/main/resources/templates/extract-page.html +++ b/src/main/resources/templates/extract-page.html @@ -18,7 +18,7 @@
      - +
      diff --git a/src/main/resources/templates/fragments/languages.html b/src/main/resources/templates/fragments/languages.html index 4e05ed11..bb8c0071 100644 --- a/src/main/resources/templates/fragments/languages.html +++ b/src/main/resources/templates/fragments/languages.html @@ -3,7 +3,7 @@ icon العربية icon Català icon 简体中文 - icon 正體中文 + icon 繁體中文 icon Deutsch icon English (GB) icon English (US) diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index 04e0dfc5..86bc6bab 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -88,7 +88,7 @@
      - +
      diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index c2a8ec26..09b833dd 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -210,9 +210,13 @@
      - +
      +
      + + +
      Account Settings
      From c575ed20365623cb4950e30ee415c14eb71defd9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:28:10 +0100 Subject: [PATCH 147/200] :memo: Update README: Translation Progress Table (#1091) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b9009640..e00c6b35 100644 --- a/README.md +++ b/README.md @@ -164,30 +164,30 @@ Stirling PDF currently supports 27! | English (English) (en_GB) | ![100%](https://geps.dev/progress/100) | | English (US) (en_US) | ![100%](https://geps.dev/progress/100) | | Arabic (العربية) (ar_AR) | ![58%](https://geps.dev/progress/58) | -| German (Deutsch) (de_DE) | ![98%](https://geps.dev/progress/98) | -| French (Français) (fr_FR) | ![94%](https://geps.dev/progress/94) | +| German (Deutsch) (de_DE) | ![97%](https://geps.dev/progress/97) | +| French (Français) (fr_FR) | ![93%](https://geps.dev/progress/93) | | Spanish (Español) (es_ES) | ![95%](https://geps.dev/progress/95) | -| Simplified Chinese (简体中文) (zh_CN) | ![99%](https://geps.dev/progress/99) | -| Traditional Chinese (繁體中文) (zh_TW) | ![99%](https://geps.dev/progress/99) | -| Catalan (Català) (ca_CA) | ![65%](https://geps.dev/progress/65) | +| Simplified Chinese (简体中文) (zh_CN) | ![98%](https://geps.dev/progress/98) | +| Traditional Chinese (繁體中文) (zh_TW) | ![98%](https://geps.dev/progress/98) | +| Catalan (Català) (ca_CA) | ![64%](https://geps.dev/progress/64) | | Italian (Italiano) (it_IT) | ![98%](https://geps.dev/progress/98) | | Swedish (Svenska) (sv_SE) | ![58%](https://geps.dev/progress/58) | -| Polish (Polski) (pl_PL) | ![60%](https://geps.dev/progress/60) | -| Romanian (Română) (ro_RO) | ![58%](https://geps.dev/progress/58) | -| Korean (한국어) (ko_KR) | ![94%](https://geps.dev/progress/94) | -| Portuguese Brazilian (Português) (pt_BR) | ![74%](https://geps.dev/progress/74) | -| Russian (Русский) (ru_RU) | ![94%](https://geps.dev/progress/94) | -| Basque (Euskara) (eu_ES) | ![76%](https://geps.dev/progress/76) | -| Japanese (日本語) (ja_JP) | ![94%](https://geps.dev/progress/94) | -| Dutch (Nederlands) (nl_NL) | ![92%](https://geps.dev/progress/92) | +| Polish (Polski) (pl_PL) | ![59%](https://geps.dev/progress/59) | +| Romanian (Română) (ro_RO) | ![57%](https://geps.dev/progress/57) | +| Korean (한국어) (ko_KR) | ![93%](https://geps.dev/progress/93) | +| Portuguese Brazilian (Português) (pt_BR) | ![73%](https://geps.dev/progress/73) | +| Russian (Русский) (ru_RU) | ![93%](https://geps.dev/progress/93) | +| Basque (Euskara) (eu_ES) | ![75%](https://geps.dev/progress/75) | +| Japanese (日本語) (ja_JP) | ![93%](https://geps.dev/progress/93) | +| Dutch (Nederlands) (nl_NL) | ![91%](https://geps.dev/progress/91) | | Greek (Ελληνικά) (el_GR) | ![92%](https://geps.dev/progress/92) | -| Turkish (Türkçe) (tr_TR) | ![99%](https://geps.dev/progress/99) | +| Turkish (Türkçe) (tr_TR) | ![98%](https://geps.dev/progress/98) | | Indonesia (Bahasa Indonesia) (id_ID) | ![87%](https://geps.dev/progress/87) | -| Hindi (हिंदी) (hi_IN) | ![88%](https://geps.dev/progress/88) | -| Hungarian (Magyar) (hu_HU) | ![87%](https://geps.dev/progress/87) | +| Hindi (हिंदी) (hi_IN) | ![87%](https://geps.dev/progress/87) | +| Hungarian (Magyar) (hu_HU) | ![86%](https://geps.dev/progress/86) | | Bulgarian (Български) (bg_BG) | ![82%](https://geps.dev/progress/82) | -| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![89%](https://geps.dev/progress/89) | -| Ukrainian (Українська) (uk_UA) | ![98%](https://geps.dev/progress/98) | +| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![88%](https://geps.dev/progress/88) | +| Ukrainian (Українська) (uk_UA) | ![93%](https://geps.dev/progress/93) | ## Contributing (creating issues, translations, fixing bugs, etc.) From 943071ebb72f45c0706ced2452b846f8ec8e606c Mon Sep 17 00:00:00 2001 From: Han <120943043+HNPorts@users.noreply.github.com> Date: Sat, 20 Apr 2024 21:18:20 +0300 Subject: [PATCH 148/200] Update messages_tr_TR.properties (#1092) --- src/main/resources/messages_tr_TR.properties | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index bf79403d..cb7cbb07 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -73,24 +73,24 @@ sponsor=Sponsor ############### # Pipeline # ############### -pipeline.header=Pipeline Menü (Beta) +pipeline.header=Çoklu İşlemler Menü (Beta) pipeline.uploadButton=Upload edin pipeline.configureButton=Yapılandır pipeline.defaultOption=Özel pipeline.submitButton=Gönder -pipeline.help=Pipeline Yardım +pipeline.help=Çoklu İşlemler Yardım pipeline.scanHelp=Klasör Tarama Yardımı ###################### # Pipeline Options # ###################### -pipelineOptions.header=Pipeline Yapılandırma -pipelineOptions.pipelineNameLabel=Pipeline İsim +pipelineOptions.header=Çoklu İşlemler Yapılandırma +pipelineOptions.pipelineNameLabel=Çoklu İşlemler İsim pipelineOptions.saveSettings=Ayarları Kaydet pipelineOptions.pipelineNamePrompt=Buraya isim girin pipelineOptions.selectOperation=İşlem Seçin pipelineOptions.addOperationButton=İşlem ekle -pipelineOptions.pipelineHeader=Pipeline: +pipelineOptions.pipelineHeader=Çoklu İşlemler: pipelineOptions.saveButton=İndir pipelineOptions.validateButton=Doğrula @@ -120,9 +120,9 @@ settings.downloadOption.3=Dosyayı indir settings.zipThreshold=İndirilen dosya sayısı şu değeri aştığında zip dosyası oluştur: settings.signOut=Oturumu Kapat settings.accountSettings=Hesap Ayarları -settings.bored.help=Enables easter egg game -settings.cacheInputs.name=Save form inputs -settings.cacheInputs.help=Enable to store previously used inputs for future runs +settings.bored.help=Paskalya yumurtası oyunu etkinleştirir +settings.cacheInputs.name=Form girdilerini kaydet +settings.cacheInputs.help=Gelecekteki çalıştırmalar için önceden kullanılan girdileri saklamayı etkinleştirin changeCreds.title=Giriş Bilgilerini Değiştir changeCreds.header=Hesap Detaylarınızı Güncelleyin @@ -326,8 +326,8 @@ home.scalePages.title=Sayfa boyutunu/ölçeğini ayarla home.scalePages.desc=Bir sayfanın ve/veya içeriğinin boyutunu/ölçeğini değiştirir scalePages.tags=boyutlandır,değiştir,boyut,uyarla -home.pipeline.title=Hattı (İleri Seviye) -home.pipeline.desc=Hattı betikleri tanımlayarak PDF'lere birden fazla işlemi çalıştır +home.pipeline.title=Çoklu İşlemler (İleri Seviye) +home.pipeline.desc=Çoklu İşlemler tanımlayarak PDF'lere birden fazla işlemi çalıştır pipeline.tags=otomatikleştir,sıralı,betikli,toplu-işlem home.add-page-numbers.title=Sayfa Numaraları Ekle @@ -596,7 +596,7 @@ autoSplitPDF.submit=Gönder #pipeline -pipeline.title=Pipeline +pipeline.title=Çoklu İşlemler #pageLayout @@ -1025,11 +1025,11 @@ split-by-sections.merge=Bir PDF'de Birleştirin #printFile -printFile.title=Print File -printFile.header=Print File to Printer -printFile.selectText.1=Select File to Print -printFile.selectText.2=Enter Printer Name -printFile.submit=Print +printFile.title=Dosya Yazdır +printFile.header=Dosyayı Yazıcıya Yazdır +printFile.selectText.1=Yazdırılacak Dosyayı Seçin +printFile.selectText.2=Yazıcı Adını Girin +printFile.submit=Yazdır #licenses From 214e23fd93f4325de4a467a1b0d9e175958af723 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 20:45:45 +0100 Subject: [PATCH 149/200] :memo: Update README: Translation Progress Table (#1093) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e00c6b35..d7d2e1aa 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ Stirling PDF currently supports 27! | Japanese (日本語) (ja_JP) | ![93%](https://geps.dev/progress/93) | | Dutch (Nederlands) (nl_NL) | ![91%](https://geps.dev/progress/91) | | Greek (Ελληνικά) (el_GR) | ![92%](https://geps.dev/progress/92) | -| Turkish (Türkçe) (tr_TR) | ![98%](https://geps.dev/progress/98) | +| Turkish (Türkçe) (tr_TR) | ![99%](https://geps.dev/progress/99) | | Indonesia (Bahasa Indonesia) (id_ID) | ![87%](https://geps.dev/progress/87) | | Hindi (हिंदी) (hi_IN) | ![87%](https://geps.dev/progress/87) | | Hungarian (Magyar) (hu_HU) | ![86%](https://geps.dev/progress/86) | From b702f5772d2b9574c66cf0995ffc4b1dd229e682 Mon Sep 17 00:00:00 2001 From: phfuh <136272363+phfuh@users.noreply.github.com> Date: Sun, 21 Apr 2024 09:44:05 +0200 Subject: [PATCH 150/200] Add selection for PDF/A output format (#1095) * Create PdfToPdfARequest.java * Change class, add output format * Add input field for output format * Change output format selection order --- .../api/converters/ConvertPDFToPDFA.java | 7 ++++--- .../model/api/converters/PdfToPdfARequest.java | 17 +++++++++++++++++ .../templates/convert/pdf-to-pdfa.html | 9 ++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java diff --git a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java index 41498413..119e0902 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java +++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java @@ -16,7 +16,7 @@ import io.github.pixee.security.Filenames; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import stirling.software.SPDF.model.api.PDFFile; +import stirling.software.SPDF.model.api.converters.PdfToPdfARequest; import stirling.software.SPDF.utils.ProcessExecutor; import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult; import stirling.software.SPDF.utils.WebResponseUtils; @@ -31,8 +31,9 @@ public class ConvertPDFToPDFA { summary = "Convert a PDF to a PDF/A", description = "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO") - public ResponseEntity pdfToPdfA(@ModelAttribute PDFFile request) throws Exception { + public ResponseEntity pdfToPdfA(@ModelAttribute PdfToPdfARequest request) throws Exception { MultipartFile inputFile = request.getFileInput(); + String outputFormat = request.getOutputFormat(); // Save the uploaded file to a temporary location Path tempInputFile = Files.createTempFile("input_", ".pdf"); @@ -47,7 +48,7 @@ public class ConvertPDFToPDFA { command.add("--skip-text"); command.add("--tesseract-timeout=0"); command.add("--output-type"); - command.add("pdfa"); + command.add(outputFormat.toString()); command.add(tempInputFile.toString()); command.add(tempOutputFile.toString()); diff --git a/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java b/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java new file mode 100644 index 00000000..59535314 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java @@ -0,0 +1,17 @@ +package stirling.software.SPDF.model.api.converters; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import stirling.software.SPDF.model.api.PDFFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class PdfToPdfARequest extends PDFFile { + + @Schema( + description = "The output PDF/A type", + allowableValues = {"pdfa", "pdfa-1"}) + private String outputFormat; +} diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index 6494cf9c..6f558a1e 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -17,6 +17,13 @@

      +
      + + +

      @@ -28,4 +35,4 @@
      - \ No newline at end of file + From e74a8e434b1dd8f7a3c68cd42f03d13f7584a7a0 Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:16:05 +0200 Subject: [PATCH 151/200] Update messages_it_IT.properties (#1096) --- src/main/resources/messages_it_IT.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index a913d534..7b14e61f 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -120,9 +120,9 @@ settings.downloadOption.3=Scarica file settings.zipThreshold=Comprimi file in .zip quando il numero di download supera settings.signOut=Logout settings.accountSettings=Impostazioni Account -settings.bored.help=Enables easter egg game -settings.cacheInputs.name=Save form inputs -settings.cacheInputs.help=Enable to store previously used inputs for future runs +settings.bored.help=Abilita easter egg game +settings.cacheInputs.name=Salva gli input del modulo +settings.cacheInputs.help=Abilitare per memorizzare gli input utilizzati in precedenza per esecuzioni future changeCreds.title=Cambia credenziali changeCreds.header=Aggiorna i dettagli del tuo account @@ -1025,11 +1025,11 @@ split-by-sections.merge=Unisci in un unico PDF #printFile -printFile.title=Print File -printFile.header=Print File to Printer -printFile.selectText.1=Select File to Print -printFile.selectText.2=Enter Printer Name -printFile.submit=Print +printFile.title=Stampa file +printFile.header=Stampa file su stampante +printFile.selectText.1=Seleziona file da stampare +printFile.selectText.2=Inserire il nome della stampante +printFile.submit=Stampare #licenses From a5000fbbc56ab253494f928cb4836873fcef2287 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sun, 21 Apr 2024 13:15:18 +0200 Subject: [PATCH 152/200] UI: settings show/hide update display (#1072) * UI: settings show/hide update display This PR replaces the PR #1003 In this PR, the visual for available update is added to the foreground. There are new settings to generally show/hide the update display, and only administrators receive the update display. * change to `Bean` * Update AppUpdateShowService.java * add update message * revision service * change shouldShow * Update githubVersion.js * rm folder * Update AppUpdateService.java --- README.md | 2 + .../SPDF/config/AppUpdateService.java | 25 ++++++++++ .../SPDF/config/ShowAdminInterface.java | 7 +++ .../config/security/AppUpdateAuthService.java | 46 +++++++++++++++++++ .../controller/web/OtherWebController.java | 1 + .../SPDF/model/ApplicationProperties.java | 22 +++++++++ src/main/resources/messages_ar_AR.properties | 1 + src/main/resources/messages_bg_BG.properties | 1 + src/main/resources/messages_ca_CA.properties | 1 + src/main/resources/messages_de_DE.properties | 1 + src/main/resources/messages_el_GR.properties | 1 + src/main/resources/messages_en_GB.properties | 1 + src/main/resources/messages_en_US.properties | 1 + src/main/resources/messages_es_ES.properties | 1 + src/main/resources/messages_eu_ES.properties | 1 + src/main/resources/messages_fr_FR.properties | 1 + src/main/resources/messages_hi_IN.properties | 1 + src/main/resources/messages_hu_HU.properties | 1 + src/main/resources/messages_id_ID.properties | 1 + src/main/resources/messages_it_IT.properties | 1 + src/main/resources/messages_ja_JP.properties | 1 + src/main/resources/messages_ko_KR.properties | 1 + src/main/resources/messages_nl_NL.properties | 1 + src/main/resources/messages_pl_PL.properties | 1 + src/main/resources/messages_pt_BR.properties | 1 + src/main/resources/messages_pt_PT.properties | 1 + src/main/resources/messages_ro_RO.properties | 1 + src/main/resources/messages_ru_RU.properties | 1 + .../resources/messages_sr_LATN_RS.properties | 1 + src/main/resources/messages_sv_SE.properties | 1 + src/main/resources/messages_tr_TR.properties | 1 + src/main/resources/messages_uk_UA.properties | 1 + src/main/resources/messages_zh_CN.properties | 1 + src/main/resources/messages_zh_TW.properties | 1 + src/main/resources/settings.yml.template | 4 +- src/main/resources/static/css/home.css | 35 ++++++++++++++ src/main/resources/static/images/update.svg | 1 + src/main/resources/static/js/githubVersion.js | 24 +++++++++- src/main/resources/static/js/homecard.js | 6 +++ .../resources/templates/fragments/navbar.html | 5 +- src/main/resources/templates/home.html | 9 ++++ 41 files changed, 210 insertions(+), 5 deletions(-) create mode 100644 src/main/java/stirling/software/SPDF/config/AppUpdateService.java create mode 100644 src/main/java/stirling/software/SPDF/config/ShowAdminInterface.java create mode 100644 src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java create mode 100644 src/main/resources/static/images/update.svg diff --git a/README.md b/README.md index d7d2e1aa..5249e3cc 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,8 @@ system: defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc) googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow customStaticFilePath: '/customFiles/static/' # Directory path for custom static files + showUpdate: true # see when a new update is available + showUpdateOnlyAdmin: false # Only admins can see when a new update is available, depending on showUpdate it must be set to 'true' #ui: # appName: exampleAppName # Application's visible name diff --git a/src/main/java/stirling/software/SPDF/config/AppUpdateService.java b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java new file mode 100644 index 00000000..7c7a9a49 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java @@ -0,0 +1,25 @@ +package stirling.software.SPDF.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Service; + +import stirling.software.SPDF.model.ApplicationProperties; + +@Service +class AppUpdateService { + + @Autowired private ApplicationProperties applicationProperties; + + @Autowired(required = false) + ShowAdminInterface showAdmin; + + @Bean(name = "shouldShow") + @Scope("request") + public boolean shouldShow() { + boolean showUpdate = applicationProperties.getSystem().getShowUpdate(); + boolean showAdminResult = (showAdmin != null) ? showAdmin.getShowUpdateOnlyAdmins() : true; + return showUpdate && showAdminResult; + } +} diff --git a/src/main/java/stirling/software/SPDF/config/ShowAdminInterface.java b/src/main/java/stirling/software/SPDF/config/ShowAdminInterface.java new file mode 100644 index 00000000..e49376e2 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/config/ShowAdminInterface.java @@ -0,0 +1,7 @@ +package stirling.software.SPDF.config; + +public interface ShowAdminInterface { + default boolean getShowUpdateOnlyAdmins() { + return true; + } +} diff --git a/src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java b/src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java new file mode 100644 index 00000000..0da07c61 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java @@ -0,0 +1,46 @@ +package stirling.software.SPDF.config.security; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; + +import stirling.software.SPDF.config.ShowAdminInterface; +import stirling.software.SPDF.model.ApplicationProperties; +import stirling.software.SPDF.model.User; +import stirling.software.SPDF.repository.UserRepository; + +@Service +class AppUpdateAuthService implements ShowAdminInterface { + + @Autowired private UserRepository userRepository; + @Autowired private ApplicationProperties applicationProperties; + + public boolean getShowUpdateOnlyAdmins() { + boolean showUpdate = applicationProperties.getSystem().getShowUpdate(); + if (!showUpdate) { + return showUpdate; + } + + boolean showUpdateOnlyAdmin = applicationProperties.getSystem().getShowUpdateOnlyAdmin(); + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication == null || !authentication.isAuthenticated()) { + return !showUpdateOnlyAdmin; + } + + if (authentication.getName().equalsIgnoreCase("anonymousUser")) { + return !showUpdateOnlyAdmin; + } + + Optional user = userRepository.findByUsername(authentication.getName()); + if (user.isPresent() && showUpdateOnlyAdmin) { + return "ROLE_ADMIN".equals(user.get().getRolesAsString()); + } + + return showUpdate; + } +} diff --git a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java index b93a89e4..b373d17a 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java @@ -17,6 +17,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Controller @Tag(name = "Misc", description = "Miscellaneous APIs") public class OtherWebController { + @GetMapping("/compress-pdf") @Hidden public String compressPdfForm(Model model) { diff --git a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java index a41d641c..1a2aeaec 100644 --- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java +++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java @@ -210,6 +210,24 @@ public class ApplicationProperties { private String rootURIPath; private String customStaticFilePath; private Integer maxFileSize; + private boolean showUpdate; + private Boolean showUpdateOnlyAdmin; + + public boolean getShowUpdateOnlyAdmin() { + return showUpdateOnlyAdmin; + } + + public void setShowUpdateOnlyAdmin(boolean showUpdateOnlyAdmin) { + this.showUpdateOnlyAdmin = showUpdateOnlyAdmin; + } + + public boolean getShowUpdate() { + return showUpdate; + } + + public void setShowUpdate(boolean showUpdate) { + this.showUpdate = showUpdate; + } private Boolean enableAlphaFunctionality; @@ -275,6 +293,10 @@ public class ApplicationProperties { + maxFileSize + ", enableAlphaFunctionality=" + enableAlphaFunctionality + + ", showUpdate=" + + showUpdate + + ", showUpdateOnlyAdmin=" + + showUpdateOnlyAdmin + "]"; } } diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 44329a7b..ac90792a 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -112,6 +112,7 @@ navbar.settings=إعدادات ############# settings.title=الإعدادات settings.update=التحديث متاح +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=إصدار التطبيق: settings.downloadOption.title=تحديد خيار التنزيل (للتنزيلات ذات الملف الواحد غير المضغوط): settings.downloadOption.1=فتح في نفس النافذة diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 71983955..6262d46d 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -112,6 +112,7 @@ navbar.settings=Настройки ############# settings.title=Настройки settings.update=Налична актуализация +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Версия на приложението: settings.downloadOption.title=Изберете опция за изтегляне (за изтегляния на един файл без да е архивиран): settings.downloadOption.1=Отваряне в същия прозорец diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 1c5fcea3..6071b16b 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -112,6 +112,7 @@ navbar.settings=Opcions ############# settings.title=Opcions settings.update=Actualització Disponible +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versió App: settings.downloadOption.title=Trieu l'opció de descàrrega (per a descàrregues d'un sol fitxer no zip): settings.downloadOption.1=Obre mateixa finestra diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 57ea05a1..729597be 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -112,6 +112,7 @@ navbar.settings=Einstellungen ############# settings.title=Einstellungen settings.update=Update verfügbar +settings.updateAvailable={0} ist die aktuelle installierte Version. Eine neue Version ({1}) ist verfügbar. settings.appVersion=App-Version: settings.downloadOption.title=Download-Option wählen (für einzelne Dateien, die keine Zip-Downloads sind): settings.downloadOption.1=Im selben Fenster öffnen diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index dac14ac7..93ab31e2 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -112,6 +112,7 @@ navbar.settings=Ρυθμίσεις ############# settings.title=Ρυθμίσεις settings.update=Υπάρχει διαθέσιμη ενημέρωση +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Έκδοση εφαρμογής: settings.downloadOption.title=Επιλέξετε την επιλογή λήψης (Για λήψεις μεμονωμένων αρχείων χωρίς zip): settings.downloadOption.1=Άνοιγμα στο ίδιο παράθυρο diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index bae8f923..30bcb9fd 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -112,6 +112,7 @@ navbar.settings=Settings ############# settings.title=Settings settings.update=Update available +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=App Version: settings.downloadOption.title=Choose download option (For single file non zip downloads): settings.downloadOption.1=Open in same window diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 1126d0ce..3f0c7afb 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -112,6 +112,7 @@ navbar.settings=Settings ############# settings.title=Settings settings.update=Update available +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=App Version: settings.downloadOption.title=Choose download option (For single file non zip downloads): settings.downloadOption.1=Open in same window diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 0da4273f..bdb42a94 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -112,6 +112,7 @@ navbar.settings=Configuración ############# settings.title=Configuración settings.update=Actualización disponible +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versión de la aplicación: settings.downloadOption.title=Elegir la opción de descarga (para descargas de un solo archivo sin ZIP): settings.downloadOption.1=Abrir en la misma ventana diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index ec20aa7f..1f8f6b6d 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -112,6 +112,7 @@ navbar.settings=Ezarpenak ############# settings.title=Ezarpenak settings.update=Eguneratze eskuragarria +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Aplikazioaren bertsioa: settings.downloadOption.title=Hautatu deskargatzeko aukera (fitxategi bakarra deskargatzeko ZIP gabe): settings.downloadOption.1=Ireki leiho berean diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 23578dcc..3aa55d09 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -112,6 +112,7 @@ navbar.settings=Paramètres ############# settings.title=Paramètres settings.update=Mise à jour disponible +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Version de l’application : settings.downloadOption.title=Choisissez l’option de téléchargement (pour les téléchargements à fichier unique non ZIP) : settings.downloadOption.1=Ouvrir dans la même fenêtre diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 898e223f..b660d678 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -112,6 +112,7 @@ navbar.settings=सेटिंग्स ############# settings.title=सेटिंग्स settings.update=अपडेट उपलब्ध है +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=ऐप संस्करण: settings.downloadOption.title=डाउनलोड विकल्प चुनें (एकल फ़ाइल गैर-ज़िप डाउनलोड के लिए): settings.downloadOption.1=एक ही विंडो में खोलें diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 03f7f2b3..c9a4957b 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -112,6 +112,7 @@ navbar.settings=Beállítások ############# settings.title=Beállítások settings.update=Frisítés elérhető +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=App Verzió: settings.downloadOption.title=Válassza ki a letöltési lehetőséget (Egyetlen fájl esetén a nem tömörített letöltésekhez): settings.downloadOption.1=Nyissa meg ugyanabban az ablakban diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index 697bb17b..3cbcc872 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -112,6 +112,7 @@ navbar.settings=Pengaturan ############# settings.title=Pengaturan settings.update=Pembaruan tersedia +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versi Aplikasi: settings.downloadOption.title=Pilih opsi unduhan (Untuk unduhan berkas tunggal non zip): settings.downloadOption.1=Buka di jendela yang sama diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 7b14e61f..140a27f7 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -112,6 +112,7 @@ navbar.settings=Impostazioni ############# settings.title=Impostazioni settings.update=Aggiornamento disponibile +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versione App: settings.downloadOption.title=Scegli opzione di download (Per file singoli non compressi): settings.downloadOption.1=Apri in questa finestra diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index b4260c5a..fed17883 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -112,6 +112,7 @@ navbar.settings=設定 ############# settings.title=設定 settings.update=利用可能なアップデート +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Appバージョン: settings.downloadOption.title=ダウンロードオプション (zip以外の単一ファイル): settings.downloadOption.1=同じウィンドウで開く diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index d78d7159..3b1d3441 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -112,6 +112,7 @@ navbar.settings=설정 ############# settings.title=설정 settings.update=업데이트 가능 +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=앱 버전: settings.downloadOption.title=다운로드 옵션 선택 (zip 파일이 아닌 단일 파일 다운로드 시): settings.downloadOption.1=현재 창에서 열기 diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index 38bdfdf0..e5668210 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -112,6 +112,7 @@ navbar.settings=Instellingen ############# settings.title=Instellingen settings.update=Update beschikbaar +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=App versie: settings.downloadOption.title=Kies download optie (Voor enkelvoudige bestanddownloads zonder zip): settings.downloadOption.1=Open in hetzelfde venster diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 7f72cc23..c94f72cb 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -112,6 +112,7 @@ navbar.settings=Ustawienia ############# settings.title=Ustawienia settings.update=Dostępna aktualizacja +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Wersia aplikacji: settings.downloadOption.title=Wybierz opcję pobierania (w przypadku pobierania pojedynczych plików innych niż ZIP): settings.downloadOption.1=Otwórz w tym samym oknie diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index 5a8d3d1f..b03402be 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -112,6 +112,7 @@ navbar.settings=Configurações ############# settings.title=Configurações settings.update=Atualização disponível +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versão do aplicativo: settings.downloadOption.title=Escolha a opção de download (para downloads não compactados de arquivo único): settings.downloadOption.1=Abrir na mesma janela diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index 4abeed7f..c1662afe 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -112,6 +112,7 @@ navbar.settings=Configurações ############# settings.title=Configurações settings.update=Atualização disponível +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versão da aplicação: settings.downloadOption.title=Escolha a opção de download (para downloads não compactados de ficheiro único): settings.downloadOption.1=Abrir na mesma janela diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 7edcc2d2..949f34cf 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -112,6 +112,7 @@ navbar.settings=Setări ############# settings.title=Setări settings.update=Actualizare disponibilă +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Versiune aplicație: settings.downloadOption.title=Alege opțiunea de descărcare (pentru descărcarea unui singur fișier non-zip): settings.downloadOption.1=Deschide în aceeași fereastră diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index b0d5cfc7..3d20fc0b 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -112,6 +112,7 @@ navbar.settings=Настройки ############# settings.title=Настройки settings.update=Доступно обновление +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Версия приложения: settings.downloadOption.title=Выберите вариант загрузки (для загрузки одного файла без zip): settings.downloadOption.1=Открыть в том же окне diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index db5499bc..7cdd2f24 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -112,6 +112,7 @@ navbar.settings=Podešavanja ############# settings.title=Podešavanja settings.update=Dostupno ažuriranje +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Verzija aplikacije: settings.downloadOption.title=Odaberite opciju preuzimanja (Za preuzimanje pojedinačnih fajlova bez zip formata): settings.downloadOption.1=Otvori u istom prozoru diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index a5d7e5f2..afa34270 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -112,6 +112,7 @@ navbar.settings=Inställningar ############# settings.title=Inställningar settings.update=Uppdatering tillgänglig +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Appversion: settings.downloadOption.title=Välj nedladdningsalternativ (för nedladdning av en fil utan zip): settings.downloadOption.1=Öppnas i samma fönster diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index cb7cbb07..2ec0bd6b 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -112,6 +112,7 @@ navbar.settings=Ayarlar ############# settings.title=Ayarlar settings.update=Güncelleme mevcut +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Uygulama Sürümü: settings.downloadOption.title=İndirme seçeneği seçin (Zip olmayan tek dosya indirmeler için): settings.downloadOption.1=Aynı pencerede aç diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index 8016ebd7..8a77d064 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -112,6 +112,7 @@ navbar.settings=Налаштування ############# settings.title=Налаштування settings.update=Доступне оновлення +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=Версія додатку: settings.downloadOption.title=Виберіть варіант завантаження (для завантаження одного файлу без zip): settings.downloadOption.1=Відкрити в тому ж вікні diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index f1fb4ced..f10f3930 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -112,6 +112,7 @@ navbar.settings=设置 ############# settings.title=设置 settings.update=可更新 +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=应用程序版本： settings.downloadOption.title=选择下载选项（单个文件非压缩文件）： settings.downloadOption.1=在同一窗口打开 diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index b2d09e10..c2cfbadb 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -112,6 +112,7 @@ navbar.settings=設定 ############# settings.title=設定 settings.update=有更新可用 +settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. settings.appVersion=應用版本： settings.downloadOption.title=選擇下載選項（對於單一檔案非壓縮下載）： settings.downloadOption.1=在同一視窗中開啟 diff --git a/src/main/resources/settings.yml.template b/src/main/resources/settings.yml.template index 0a326e17..b3d6e954 100644 --- a/src/main/resources/settings.yml.template +++ b/src/main/resources/settings.yml.template @@ -12,7 +12,9 @@ system: defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc) googlevisibility: false # 'true' to allow Google visibility (via robots.txt), 'false' to disallow enableAlphaFunctionality: false # Set to enable functionality which might need more testing before it fully goes live (This feature might make no changes) - + showUpdate: true # see when a new update is available + showUpdateOnlyAdmin: false # Only admins can see when a new update is available, depending on showUpdate it must be set to 'true' + #ui: # appName: exampleAppName # Application's visible name # homeDescription: I am a description # Short description or tagline shown on homepage. diff --git a/src/main/resources/static/css/home.css b/src/main/resources/static/css/home.css index d975dd79..ff8d1cf7 100644 --- a/src/main/resources/static/css/home.css +++ b/src/main/resources/static/css/home.css @@ -89,3 +89,38 @@ .jumbotron { padding: 3rem 3rem; /* Reduce vertical padding */ } + +.lookatme { + opacity: 1; + position: relative; + display: inline-block; +} + +.lookatme::after { + color: #e33100; + text-shadow: 0 0 5px #e33100; + /* in the html, the data-lookatme-text attribute must */ + /* contain the same text as the .lookatme element */ + content: attr(data-lookatme-text); + padding: inherit; + position: absolute; + inset: 0 0 0 0; + z-index: 1; + /* 20 steps / 2 seconds = 10fps */ + -webkit-animation: 2s infinite Pulse steps(20); + animation: 2s infinite Pulse steps(20); +} + +@keyframes Pulse { + from { + opacity: 0; + } + + 50% { + opacity: 1; + } + + to { + opacity: 0; + } +} diff --git a/src/main/resources/static/images/update.svg b/src/main/resources/static/images/update.svg new file mode 100644 index 00000000..3edc4c67 --- /dev/null +++ b/src/main/resources/static/images/update.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/static/js/githubVersion.js b/src/main/resources/static/js/githubVersion.js index e17524d5..b312fd85 100644 --- a/src/main/resources/static/js/githubVersion.js +++ b/src/main/resources/static/js/githubVersion.js @@ -30,19 +30,39 @@ async function getLatestReleaseVersion() { async function checkForUpdate() { // Initialize the update button as hidden - var updateBtn = document.getElementById("update-btn"); + var updateBtn = document.getElementById("update-btn") || null; + var updateLink = document.getElementById("update-link") || null; if (updateBtn !== null) { updateBtn.style.display = "none"; } + if (updateLink !== null) { + console.log("hidden!"); + if (!updateLink.classList.contains("visually-hidden")) { + updateLink.classList.add("visually-hidden"); + } + } const latestVersion = await getLatestReleaseVersion(); console.log("latestVersion=" + latestVersion); console.log("currentVersion=" + currentVersion); console.log("compareVersions(latestVersion, currentVersion) > 0)=" + compareVersions(latestVersion, currentVersion)); if (latestVersion && compareVersions(latestVersion, currentVersion) > 0) { - document.getElementById("update-btn").style.display = "block"; + if (updateBtn != null) { + document.getElementById("update-btn").style.display = "block"; + } + if (updateLink !== null) { + document.getElementById("app-update").innerHTML = updateAvailable.replace("{0}", '' + currentVersion + '').replace("{1}", '' + latestVersion + ''); + if (updateLink.classList.contains("visually-hidden")) { + updateLink.classList.remove("visually-hidden"); + } + } console.log("visible"); } else { + if (updateLink !== null) { + if (!updateLink.classList.contains("visually-hidden")) { + updateLink.classList.add("visually-hidden"); + } + } console.log("hidden"); } } diff --git a/src/main/resources/static/js/homecard.js b/src/main/resources/static/js/homecard.js index 8ac2ef44..c461af3c 100644 --- a/src/main/resources/static/js/homecard.js +++ b/src/main/resources/static/js/homecard.js @@ -46,6 +46,12 @@ function reorderCards() { cards.sort(function (a, b) { var aIsFavorite = localStorage.getItem(a.id) === "favorite"; var bIsFavorite = localStorage.getItem(b.id) === "favorite"; + if (a.id === "update-link") { + return -1; + } + if (b.id === "update-link") { + return 1; + } if (aIsFavorite && !bIsFavorite) { return -1; } diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 09b833dd..414ff51f 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -3,6 +3,7 @@
      @@ -210,7 +211,7 @@
      - +
      diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index ed1c6a18..83528d4f 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -23,6 +23,15 @@
      +
      From 5185fd13b8cfa81219d293cc99626ee76eb353d3 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sun, 21 Apr 2024 17:30:17 +0200 Subject: [PATCH 153/200] updating the build files (#1100) --- .github/workflows/build.yml | 28 ++-- .github/workflows/licenses-update.yml | 15 ++- .github/workflows/push-docker.yml | 172 ++++++++++++------------- .github/workflows/releaseArtifacts.yml | 84 +++++++----- .github/workflows/swagger.yml | 41 +++--- .github/workflows/test.yml | 64 ++++----- 6 files changed, 201 insertions(+), 203 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dd64aca..f4d37599 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,12 @@ name: "Build repo" on: push: - branches: [ "main" ] + branches: ["main"] paths-ignore: - ".github/**" - "**/*.md" pull_request: - branches: [ "main" ] + branches: ["main"] paths-ignore: - ".github/**" - "**/*.md" @@ -25,16 +25,18 @@ jobs: fail-fast: false steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: "temurin" - - uses: gradle/gradle-build-action@v2.4.2 - with: - gradle-version: 7.6 - arguments: build --no-build-cache + - uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 7.6 + + - name: Build with Gradle + run: ./gradlew build --no-build-cache diff --git a/.github/workflows/licenses-update.yml b/.github/workflows/licenses-update.yml index 1fd3acfb..a3996bc6 100644 --- a/.github/workflows/licenses-update.yml +++ b/.github/workflows/licenses-update.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - 'build.gradle' + - "build.gradle" permissions: contents: write @@ -17,13 +17,15 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: '17' - distribution: 'adopt' + java-version: "17" + distribution: "adopt" + + - uses: gradle/actions/setup-gradle@v3 - name: Run Gradle Command run: ./gradlew clean generateLicenseReport @@ -44,7 +46,7 @@ jobs: - name: Create Pull Request if: env.CHANGES_DETECTED == 'true' - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: "Update 3rd Party Licenses" @@ -58,4 +60,3 @@ jobs: [1]: https://github.com/peter-evans/create-pull-request draft: false delete-branch: true - diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index e34f17b2..f8fc4200 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -14,105 +14,99 @@ jobs: push: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - - uses: actions/checkout@v3.5.2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: "temurin" - - name: Set up JDK 17 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' + - uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 7.6 + - name: Run Gradle Command + run: ./gradlew clean build + env: + DOCKER_ENABLE_SECURITY: false - - uses: gradle/gradle-build-action@v2.4.2 - env: - DOCKER_ENABLE_SECURITY: false - with: - gradle-version: 7.6 - arguments: clean build + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 - - name: Make Gradle wrapper executable - run: chmod +x gradlew + - name: Get version number + id: versionNumber + run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT - - name: Get version number - id: versionNumber - run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_API }} - - name: Login to Docker Hub - uses: docker/login-action@v2.1.0 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_API }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ github.token }} - - name: Login to GitHub Container Registry - uses: docker/login-action@v2.1.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ github.token }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - - name: Convert repository owner to lowercase - id: repoowner - run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" + - name: Convert repository owner to lowercase + id: repoowner + run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT - - name: Generate tags - id: meta - uses: docker/metadata-action@v4.4.0 - with: - images: | - ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf - ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf - tags: | - type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} + - name: Generate tags + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf + ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf + tags: | + type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + - name: Build and push main Dockerfile + uses: docker/build-push-action@v5 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + push: true + cache-from: type=gha + cache-to: type=gha,mode=max + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }} + platforms: linux/amd64,linux/arm64/v8 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.5.0 + - name: Generate tags ultra-lite + id: meta2 + uses: docker/metadata-action@v5 + if: github.ref != 'refs/heads/main' + with: + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf + ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf + tags: | + type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} - - name: Build and push main Dockerfile - uses: docker/build-push-action@v4.0.0 - with: - context: . - dockerfile: ./Dockerfile - push: true - cache-from: type=gha - cache-to: type=gha,mode=max - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: - VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }} - platforms: linux/amd64,linux/arm64/v8 - - - - - name: Generate tags ultra-lite - id: meta2 - uses: docker/metadata-action@v4.4.0 - if: github.ref != 'refs/heads/main' - with: - images: | - ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf - ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf - tags: | - type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }} - - - - name: Build and push Dockerfile-ultra-lite - uses: docker/build-push-action@v4.0.0 - if: github.ref != 'refs/heads/main' - with: - context: . - file: ./Dockerfile-ultra-lite - push: true - cache-from: type=gha - cache-to: type=gha,mode=max - tags: ${{ steps.meta2.outputs.tags }} - labels: ${{ steps.meta2.outputs.labels }} - build-args: - VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }} - platforms: linux/amd64,linux/arm64/v8 \ No newline at end of file + - name: Build and push Dockerfile-ultra-lite + uses: docker/build-push-action@v5 + if: github.ref != 'refs/heads/main' + with: + context: . + file: ./Dockerfile-ultra-lite + push: true + cache-from: type=gha + cache-to: type=gha,mode=max + tags: ${{ steps.meta2.outputs.tags }} + labels: ${{ steps.meta2.outputs.labels }} + build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }} + platforms: linux/amd64,linux/arm64/v8 diff --git a/.github/workflows/releaseArtifacts.yml b/.github/workflows/releaseArtifacts.yml index 5042141a..f9b5f2b0 100644 --- a/.github/workflows/releaseArtifacts.yml +++ b/.github/workflows/releaseArtifacts.yml @@ -1,6 +1,7 @@ name: Release Artifacts on: + workflow_dispatch: release: types: [created] permissions: @@ -14,44 +15,61 @@ jobs: enable_security: [true, false] include: - enable_security: true - file_suffix: '-with-login' + file_suffix: "-with-login" - enable_security: false - file_suffix: '' + file_suffix: "" steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: "temurin" - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 7.6 - - name: Generate jar (With Security=${{ matrix.enable_security }}) - run: ./gradlew clean createExe - env: - DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }} + - name: Generate jar (With Security=${{ matrix.enable_security }}) + run: ./gradlew clean createExe + env: + DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }} - - name: Upload binaries to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./build/launch4j/Stirling-PDF.exe - asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe - tag: ${{ github.ref }} - overwrite: true + - name: Get version number + id: versionNumber + run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT - - name: Get version number - id: versionNumber - run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" + - name: Rename binarie + if: matrix.file_suffix != '' + run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe - - name: Upload jar binaries to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar - asset_name: Stirling-PDF${{ matrix.file_suffix }}.jar - tag: ${{ github.ref }} - overwrite: true + - name: Upload Assets binarie + uses: actions/upload-artifact@v4 + with: + path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe + name: Stirling-PDF${{ matrix.file_suffix }}.exe + overwrite: true + retention-days: 1 + if-no-files-found: error + - name: Upload binaries to release + uses: softprops/action-gh-release@v2 + with: + files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe + + - name: Rename jar binaries + run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar + + - name: Upload Assets jar binaries + uses: actions/upload-artifact@v4 + with: + path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar + name: Stirling-PDF${{ matrix.file_suffix }}.jar + overwrite: true + retention-days: 1 + if-no-files-found: error + + - name: Upload jar binaries to release + uses: softprops/action-gh-release@v2 + with: + files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index f60bc15f..88e6df7e 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -8,31 +8,32 @@ on: jobs: push: - runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - - uses: actions/checkout@v3.5.2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: "temurin" - - name: Set up JDK 17 - uses: actions/setup-java@v3.11.0 - with: - java-version: '17' - distribution: 'temurin' + - uses: gradle/actions/setup-gradle@v3 - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Generate Swagger documentation + run: ./gradlew generateOpenApiDocs - - name: Generate Swagger documentation - run: ./gradlew generateOpenApiDocs + - name: Upload Swagger Documentation to SwaggerHub + run: ./gradlew swaggerhubUpload + env: + SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} - - name: Upload Swagger Documentation to SwaggerHub - run: ./gradlew swaggerhubUpload - env: - SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} + - name: Get version number + id: versionNumber + run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT - - name: Set API version as published and default on SwaggerHub - run: | - curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"published\":true,\"default\":true}" - env: - SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} + - name: Set API version as published and default on SwaggerHub + run: | + curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"published\":true,\"default\":true}" + env: + SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1920a339..eef33335 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,54 +3,36 @@ name: Docker Compose Tests on: pull_request: paths: - - 'src/**' - - '**.gradle' - - '!src/main/java/resources/messages*' - - 'exampleYmlFiles/**' - - 'Dockerfile' - - 'Dockerfile**' + - "src/**" + - "**.gradle" + - "!src/main/java/resources/messages*" + - "exampleYmlFiles/**" + - "Dockerfile" + - "Dockerfile**" jobs: test: runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 + - name: Checkout Repository + uses: actions/checkout@v4 - - name: Set up Java 17 - uses: actions/setup-java@v2 - with: - java-version: '17' - distribution: 'adopt' + - name: Set up Java 17 + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: "adopt" - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - - name: Run Docker Compose Tests - run: | - chmod +x ./gradlew + - name: Install Docker Compose + run: | + sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + # sudo chmod +x /usr/local/bin/docker-compose - - name: Get version number - id: versionNumber - run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" - - - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ steps.versionNumber.outputs.versionNumber }} - restore-keys: | - ${{ runner.os }}-buildx- - - - name: Install Docker Compose - run: | - sudo curl -L "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - - - - name: Run Docker Compose Tests - run: | - chmod +x ./test.sh - ./test.sh + - name: Run Docker Compose Tests + run: | + chmod +x ./test.sh + ./test.sh From 3189d9dda899a3c8762a36df7285476cf10818a9 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sun, 21 Apr 2024 22:16:39 +0200 Subject: [PATCH 154/200] Check `DOCKER_ENABLE_SECURITY` for UI (#1103) When using `DOCKER_ENABLE_SECURITY=false`, the logout button and `Account Settings` are no longer displayed. --- src/main/java/stirling/software/SPDF/config/AppConfig.java | 7 +++++++ .../SPDF/config/security/SecurityConfiguration.java | 5 +++++ src/main/resources/templates/fragments/navbar.html | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java index fc5e9596..d239969f 100644 --- a/src/main/java/stirling/software/SPDF/config/AppConfig.java +++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java @@ -6,6 +6,7 @@ import java.nio.file.Paths; import java.util.Properties; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; @@ -85,4 +86,10 @@ public class AppConfig { } return "true".equalsIgnoreCase(installOps); } + + @ConditionalOnMissingClass("stirling.software.SPDF.config.security.SecurityConfiguration") + @Bean(name = "activSecurity") + public boolean missingActivSecurity() { + return false; + } } diff --git a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java index e9497f20..bbea5e96 100644 --- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java @@ -166,4 +166,9 @@ public class SecurityConfiguration { public PersistentTokenRepository persistentTokenRepository() { return new JPATokenRepositoryImpl(); } + + @Bean + public boolean activSecurity() { + return true; + } } diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 414ff51f..4d67edb6 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -218,10 +218,10 @@
      - Account Settings + Account Settings
      - Sign Out + Sign Out
      From eddcc11fe48d18442ccb73f181d5ff3d93f221e2 Mon Sep 17 00:00:00 2001 From: diemade Date: Sun, 21 Apr 2024 23:31:45 +0200 Subject: [PATCH 155/200] German translation for Print Tool (#1104) * Update messages_de_DE.properties Only full sentences should end in a period, * Update messages_de_DE.properties * Update messages_de_DE.properties --------- Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- src/main/resources/messages_de_DE.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 729597be..7837b6b9 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -1026,11 +1026,11 @@ split-by-sections.merge=In eine PDF zusammenfügen #printFile -printFile.title=Print File -printFile.header=Print File to Printer -printFile.selectText.1=Select File to Print -printFile.selectText.2=Enter Printer Name -printFile.submit=Print +printFile.title=Datei drucken +printFile.header=Datei an Drucker senden +printFile.selectText.1=Wähle die auszudruckende Datei +printFile.selectText.2=Druckernamen eingeben +printFile.submit=Drucken #licenses From 1e0ec8345a8b1ef80468a4e10af5e7cb9d91bb71 Mon Sep 17 00:00:00 2001 From: NeilJared Date: Sun, 21 Apr 2024 23:50:36 +0200 Subject: [PATCH 156/200] >Updated es_ES (100% completed) (#1106) Update messages_es_ES.properties Updated es_ES translation (100% done) --- src/main/resources/messages_es_ES.properties | 90 ++++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index bdb42a94..867df9ac 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -58,15 +58,15 @@ invalidUsernameMessage=Nombre de usuario no válido, El nombre de ususario debe deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso. deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse. error=Error -oops=Oops! +oops=Ups! help=Help -goHomepage=Go to Homepage -joinDiscord=Join our Discord server -seeDockerHub=See Docker Hub -visitGithub=Visit Github Repository -donate=Donate +goHomepage=Ir a la página principal +joinDiscord=Únase a nuestro servidor Discord +seeDockerHub=Ver Docker Hub +visitGithub=Visitar Repositorio de Github +donate=Donar color=Color -sponsor=Sponsor +sponsor=Patrocinador @@ -78,8 +78,8 @@ pipeline.uploadButton=Cargar personalización pipeline.configureButton=Configurar pipeline.defaultOption=Personalizar pipeline.submitButton=Enviar -pipeline.help=Pipeline Help -pipeline.scanHelp=Folder Scanning Help +pipeline.help=Ayuda de Canalización +pipeline.scanHelp=Ayuda de escaneado de carpetas ###################### # Pipeline Options # @@ -112,7 +112,7 @@ navbar.settings=Configuración ############# settings.title=Configuración settings.update=Actualización disponible -settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. +settings.updateAvailable={0} es la versión instalada. Hay disponible una versión nueva ({1}). settings.appVersion=Versión de la aplicación: settings.downloadOption.title=Elegir la opción de descarga (para descargas de un solo archivo sin ZIP): settings.downloadOption.1=Abrir en la misma ventana @@ -121,9 +121,9 @@ settings.downloadOption.3=Descargar el archivo settings.zipThreshold=Archivos ZIP cuando excede el número de archivos descargados settings.signOut=Desconectar settings.accountSettings=Configuración de la cuenta -settings.bored.help=Enables easter egg game -settings.cacheInputs.name=Save form inputs -settings.cacheInputs.help=Enable to store previously used inputs for future runs +settings.bored.help=Habilita el juego del huevo de pascua +settings.cacheInputs.name=Guardar entradas del formulario +settings.cacheInputs.help=Habilitar guardar entradas previamente utilizadas para futuras acciones changeCreds.title=Cambiar Credenciales changeCreds.header=Actualice los detalles de su cuenta @@ -247,7 +247,7 @@ compressPdfs.tags=aplastar,pequeño,diminuto home.changeMetadata.title=Cambiar metadatos home.changeMetadata.desc=Cambiar/Eliminar/Añadir metadatos al documento PDF -changeMetadata.tags==Título,autor,fecha,creación,hora,editorial,productor,estadísticas +changeMetadata.tags=título,autor,fecha,creación,hora,editorial,productor,estadísticas home.fileToPDF.title=Convertir archivo a PDF home.fileToPDF.desc=Convertir casi cualquier archivo a PDF (DOCX, PNG, XLS, PPT, TXT y más) @@ -772,23 +772,23 @@ merge.submit=Unir pdfOrganiser.title=Organizador de páginas pdfOrganiser.header=Organizador de páginas PDF pdfOrganiser.submit=Organizar páginas -pdfOrganiser.mode=Mode -pdfOrganiser.mode.1=Custom Page Order -pdfOrganiser.mode.2=Reverse Order -pdfOrganiser.mode.3=Duplex Sort -pdfOrganiser.mode.4=Booklet Sort -pdfOrganiser.mode.5=Side Stitch Booklet Sort -pdfOrganiser.mode.6=Odd-Even Split -pdfOrganiser.mode.7=Remove First -pdfOrganiser.mode.8=Remove Last -pdfOrganiser.mode.9=Remove First and Last -pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1) +pdfOrganiser.mode=Modo +pdfOrganiser.mode.1=Orden de páginas personalizado +pdfOrganiser.mode.2=Orden inverso +pdfOrganiser.mode.3=Ordenar dúplex +pdfOrganiser.mode.4=Ordenar folleto +pdfOrganiser.mode.5=Orden de folleto de encuadernado lateral +pdfOrganiser.mode.6=División par-impar +pdfOrganiser.mode.7=Quitar primera +pdfOrganiser.mode.8=Quitar última +pdfOrganiser.mode.9=Quitar primera y última +pdfOrganiser.placeholder=(por ej., 1,3,2 o 4-8,2,10-12 o 2n-1) #multiTool multiTool.title=Multi-herramienta PDF multiTool.header=Multi-herramienta PDF -multiTool.uploadPrompts=Please Upload PDF +multiTool.uploadPrompts=Por favor, cargue PDF #view pdf viewPdf.title=Ver PDF @@ -887,8 +887,8 @@ watermark.selectText.7=Opacidad (0% - 100%): watermark.selectText.8=Tipo de marca de agua: watermark.selectText.9=Imagen de marca de agua: watermark.submit=Añadir marca de agua -watermark.type.1=Text -watermark.type.2=Image +watermark.type.1=Texto +watermark.type.2=Imagen #Change permissions @@ -940,7 +940,7 @@ pdfToPDFA.title=PDF a PDF/A pdfToPDFA.header=PDF a PDF/A pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A pdfToPDFA.submit=Convertir -pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.tip=Actualmente no funciona para múltiples entrada a la vez #PDFToWord @@ -1026,11 +1026,11 @@ split-by-sections.merge=Unir en Un PDF #printFile -printFile.title=Print File -printFile.header=Print File to Printer -printFile.selectText.1=Select File to Print -printFile.selectText.2=Enter Printer Name -printFile.submit=Print +printFile.title=Imprimir archivo +printFile.header=Imprimir archivo en la impresora +printFile.selectText.1=Seleccionar archivo para imprimir +printFile.selectText.2=Introducir nombre de la impresora +printFile.submit=Imprimir #licenses @@ -1043,15 +1043,15 @@ licenses.license=Licencia # error -error.sorry=Sorry for the issue! -error.needHelp=Need help / Found an issue? -error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord: -error.404.head=404 - Page Not Found | Oops, we tripped in the code! -error.404.1=We can't seem to find the page you're looking for. -error.404.2=Something went wrong -error.github=Submit a ticket on GitHub -error.showStack=Show Stack Trace -error.copyStack=Copy Stack Trace -error.githubSubmit=GitHub - Submit a ticket -error.discordSubmit=Discord - Submit Support post +error.sorry=¡Perdón por el fallo! +error.needHelp=Necesita ayuda / Encontró un fallo? +error.contactTip=Si sigue experimentando errores, no dude en contactarnos para solicitar soporte. Puede enviarnos un ticket en la página de GitHub o contactarnos mediante Discord: +error.404.head=404 - Página no encontrada | Ups, tropezamos con el código! +error.404.1=Parece que no podemos encontrar la página que está buscando. +error.404.2=Algo salió mal +error.github=Envíe un ticket en GitHub +error.showStack=Mostrar seguimiento de pila +error.copyStack=Mostrar seguimiento de pila +error.githubSubmit=GitHub - Enviar un ticket +error.discordSubmit=Discord - Enviar mensaje de soporte From 6c052a7b25cb189f9c083566d99078ebffccec57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 23:00:40 +0100 Subject: [PATCH 157/200] :memo: Update README: Translation Progress Table (#1107) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5249e3cc..480b1271 100644 --- a/README.md +++ b/README.md @@ -164,9 +164,9 @@ Stirling PDF currently supports 27! | English (English) (en_GB) | ![100%](https://geps.dev/progress/100) | | English (US) (en_US) | ![100%](https://geps.dev/progress/100) | | Arabic (العربية) (ar_AR) | ![58%](https://geps.dev/progress/58) | -| German (Deutsch) (de_DE) | ![97%](https://geps.dev/progress/97) | +| German (Deutsch) (de_DE) | ![98%](https://geps.dev/progress/98) | | French (Français) (fr_FR) | ![93%](https://geps.dev/progress/93) | -| Spanish (Español) (es_ES) | ![95%](https://geps.dev/progress/95) | +| Spanish (Español) (es_ES) | ![99%](https://geps.dev/progress/99) | | Simplified Chinese (简体中文) (zh_CN) | ![98%](https://geps.dev/progress/98) | | Traditional Chinese (繁體中文) (zh_TW) | ![98%](https://geps.dev/progress/98) | | Catalan (Català) (ca_CA) | ![64%](https://geps.dev/progress/64) | From 71e93e3cb5f102d3cf83507033c8fc765519104a Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 21 Apr 2024 23:06:44 +0100 Subject: [PATCH 158/200] print (WIP), fake scan (WIP) and text conversion for ultra-lite (#1098) * Changes! * lang * fake scan init, print init and pdf to text for exe * Hardening suggestions for Stirling-PDF / changes (#1099) * Switch order of literals to prevent NullPointerException * Introduced protections against predictable RNG abuse --------- Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com> * Update README.md * install custom fonts * Formats etc * version bump * disable WIP work * remove chinese font --------- Co-authored-by: pixeebot[bot] <104101892+pixeebot[bot]@users.noreply.github.com> Co-authored-by: systo --- Dockerfile | 7 +- README.md | 4 +- build.gradle | 2 +- exampleYmlFiles/docker-compose-latest.yml | 2 + scripts/init-without-ocr.sh | 15 +- scripts/init.sh | 30 +- scripts/installFonts.sh | 67 ++++ .../software/SPDF/SPdfApplication.java | 1 + .../SPDF/config/EndpointConfiguration.java | 5 +- .../api/converters/ConvertPDFToPDFA.java | 3 +- .../api/misc/FakeScanControllerWIP.java | 287 ++++++++++++------ .../api/misc/PrintFileController.java | 106 +++++++ .../controller/web/OtherWebController.java | 14 + .../SPDF/model/api/misc/PrintFileRequest.java | 15 + .../software/SPDF/utils/PdfUtils.java | 2 +- .../templates/convert/pdf-to-text.html | 5 +- .../resources/templates/misc/fake-scan.html | 29 ++ .../resources/templates/misc/print-file.html | 35 +++ test.sh | 8 +- 19 files changed, 494 insertions(+), 143 deletions(-) create mode 100644 scripts/installFonts.sh create mode 100644 src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java create mode 100644 src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java create mode 100644 src/main/resources/templates/misc/fake-scan.html create mode 100644 src/main/resources/templates/misc/print-file.html diff --git a/Dockerfile b/Dockerfile index 8f16eba9..ec91597a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,15 +25,17 @@ ENV DOCKER_ENABLE_SECURITY=false \ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ + apk update && \ apk add --no-cache \ ca-certificates \ tzdata \ tini \ + openssl \ +openssl-dev \ bash \ curl \ openjdk17-jre \ su-exec \ - font-noto-cjk \ shadow \ # Doc conversion libreoffice@testing \ @@ -58,7 +60,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \ chown stirlingpdfuser:stirlingpdfgroup /app.jar && \ - tesseract --list-langs + tesseract --list-langs && \ + rm -rf /var/cache/apk/* EXPOSE 8080 diff --git a/README.md b/README.md index 480b1271..62eb14f0 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ docker run -d \ -v /location/of/logs:/logs \ -e DOCKER_ENABLE_SECURITY=false \ -e INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false \ + -e LANGS=en_GB \ --name stirling-pdf \ frooodle/s-pdf:latest @@ -147,6 +148,7 @@ services: environment: - DOCKER_ENABLE_SECURITY=false - INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false + - LANGS=en_GB ``` Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman". @@ -252,13 +254,13 @@ metrics: - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login) - ``INSTALL_BOOK_AND_ADVANCED_HTML_OPS`` to download calibre onto stirling-pdf enabling pdf to/from book and advanced html conversion +- ``LANGS`` to define custom font libraries to install for use for document conversions ## API For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation [here](https://app.swaggerhub.com/apis-docs/Stirling-Tools/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF) - ## Login authentication ![stirling-login](images/login-light.png) diff --git a/build.gradle b/build.gradle index d99fbc48..0cb4d653 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { import com.github.jk1.license.render.* group = 'stirling.software' -version = '0.22.8' +version = '0.23.0' sourceCompatibility = '17' repositories { diff --git a/exampleYmlFiles/docker-compose-latest.yml b/exampleYmlFiles/docker-compose-latest.yml index e39087dd..c2593332 100644 --- a/exampleYmlFiles/docker-compose-latest.yml +++ b/exampleYmlFiles/docker-compose-latest.yml @@ -21,6 +21,8 @@ services: environment: DOCKER_ENABLE_SECURITY: "false" SECURITY_ENABLELOGIN: "false" + LANGS: "en_GB,en_US,ar_AR,de_DE,fr_FR,es_ES,zh_CN,zh_TW,ca_CA,it_IT,sv_SE,pl_PL,ro_RO,ko_KR,pt_BR,ru_RU,el_GR,hi_IN,hu_HU,tr_TR,id_ID" + INSTALL_BOOK_AND_ADVANCED_HTML_OPS: "true" SYSTEM_DEFAULTLOCALE: en-US UI_APPNAME: Stirling-PDF UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest diff --git a/scripts/init-without-ocr.sh b/scripts/init-without-ocr.sh index 64e6dab0..761dd08d 100644 --- a/scripts/init-without-ocr.sh +++ b/scripts/init-without-ocr.sh @@ -1,26 +1,31 @@ -#!/bin/sh +#!/bin/bash # Update the user and group IDs as per environment variables if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then usermod -o -u "$PUID" stirlingpdfuser || true fi + if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then groupmod -o -g "$PGID" stirlingpdfgroup || true fi umask "$UMASK" || true - if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then apk add --no-cache calibre@testing fi /scripts/download-security-jar.sh +if [[ -n "$LANGS" ]]; then + /scripts/installFonts.sh $LANGS +fi + echo "Setting permissions and ownership for necessary directories..." -if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar; then - chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true - # If chown succeeds, execute the command as stirlingpdfuser +# Attempt to change ownership of directories and files +if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /app.jar; then + chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /app.jar || true + # If chown succeeds, execute the command as stirlingpdfuser exec su-exec stirlingpdfuser "$@" else # If chown fails, execute the command without changing the user context diff --git a/scripts/init.sh b/scripts/init.sh index f06527d0..b0e2a095 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -13,18 +13,6 @@ if [ -d /usr/share/tesseract-ocr/5/tessdata ]; then cp -r /usr/share/tesseract-ocr/5/tessdata/* /usr/share/tessdata || true; fi -# Update the user and group IDs as per environment variables -if [ ! -z "$PUID" ] && [ "$PUID" != "$(id -u stirlingpdfuser)" ]; then - usermod -o -u "$PUID" stirlingpdfuser || true -fi - - -if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -f3)" ]; then - groupmod -o -g "$PGID" stirlingpdfgroup || true -fi -umask "$UMASK" || true - - # Check if TESSERACT_LANGS environment variable is set and is not empty if [[ -n "$TESSERACT_LANGS" ]]; then # Convert comma-separated values to a space-separated list @@ -40,20 +28,4 @@ if [[ -n "$TESSERACT_LANGS" ]]; then done fi -if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then - apk add --no-cache calibre@testing -fi - -/scripts/download-security-jar.sh - -echo "Setting permissions and ownership for necessary directories..." -# Attempt to change ownership of directories and files -if chown -R stirlingpdfuser:stirlingpdfgroup $HOME /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar; then - chmod -R 755 /logs /scripts /usr/share/fonts/opentype/noto /usr/share/tessdata /configs /customFiles /pipeline /app.jar || true - # If chown succeeds, execute the command as stirlingpdfuser - exec su-exec stirlingpdfuser "$@" -else - # If chown fails, execute the command without changing the user context - echo "[WARN] Chown failed, running as host user" - exec "$@" -fi +/scripts/init-without-ocr.sh "$@" \ No newline at end of file diff --git a/scripts/installFonts.sh b/scripts/installFonts.sh new file mode 100644 index 00000000..d7eb7af6 --- /dev/null +++ b/scripts/installFonts.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +LANGS=$1 + +# Function to install a font package +install_font() { + echo "Installing font package: $1" + if ! apk add "$1" --no-cache; then + echo "Failed to install $1" + fi +} + +# Install common fonts used across many languages +#common_fonts=( +# font-terminus +# font-dejavu +# font-noto +# font-noto-cjk +# font-awesome +# font-noto-extra +#) +# +#for font in "${common_fonts[@]}"; do +# install_font $font +#done + +# Map languages to specific font packages +declare -A language_fonts=( + ["ar_AR"]="font-noto-arabic" + ["zh_CN"]="font-isas-misc" + ["zh_TW"]="font-isas-misc" + ["ja_JP"]="font-noto font-noto-thai font-noto-tibetan font-ipa font-sony-misc font-jis-misc" + ["ru_RU"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic" + ["sr_LATN_RS"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic" + ["uk_UA"]="font-vollkorn font-misc-cyrillic font-mutt-misc font-screen-cyrillic font-winitzki-cyrillic font-cronyx-cyrillic" + ["ko_KR"]="font-noto font-noto-thai font-noto-tibetan" + ["el_GR"]="font-noto" + ["hi_IN"]="font-noto-devanagari" + ["bg_BG"]="font-vollkorn font-misc-cyrillic" + ["GENERAL"]="font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra" +) + +# Install fonts for other languages which generally do not need special packages beyond 'font-noto' +other_langs=("en_GB" "en_US" "de_DE" "fr_FR" "es_ES" "ca_CA" "it_IT" "pt_BR" "nl_NL" "sv_SE" "pl_PL" "ro_RO" "hu_HU" "tr_TR" "id_ID" "eu_ES") +if [[ $LANGS == "ALL" ]]; then + # Install all fonts from the language_fonts map + for fonts in "${language_fonts[@]}"; do + for font in $fonts; do + install_font $font + done + done +else + # Split comma-separated languages and install necessary fonts + IFS=',' read -ra LANG_CODES <<< "$LANGS" + for code in "${LANG_CODES[@]}"; do + if [[ " ${other_langs[@]} " =~ " ${code} " ]]; then + install_font font-noto + else + fonts_to_install=${language_fonts[$code]} + if [ ! -z "$fonts_to_install" ]; then + for font in $fonts_to_install; do + install_font $font + done + fi + fi + done +fi diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java index db1eeb82..e21dadb1 100644 --- a/src/main/java/stirling/software/SPDF/SPdfApplication.java +++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java @@ -62,6 +62,7 @@ public class SPdfApplication { } public static void main(String[] args) throws IOException, InterruptedException { + SpringApplication app = new SpringApplication(SPdfApplication.class); app.addInitializers(new ConfigInitializer()); if (Files.exists(Paths.get("configs/settings.yml"))) { diff --git a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java index 9a070e52..b145b478 100644 --- a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java @@ -146,7 +146,6 @@ public class EndpointConfiguration { addEndpointToGroup("CLI", "xlsx-to-pdf"); addEndpointToGroup("CLI", "pdf-to-word"); addEndpointToGroup("CLI", "pdf-to-presentation"); - addEndpointToGroup("CLI", "pdf-to-text"); addEndpointToGroup("CLI", "pdf-to-html"); addEndpointToGroup("CLI", "pdf-to-xml"); addEndpointToGroup("CLI", "ocr-pdf"); @@ -154,6 +153,7 @@ public class EndpointConfiguration { addEndpointToGroup("CLI", "url-to-pdf"); addEndpointToGroup("CLI", "book-to-pdf"); addEndpointToGroup("CLI", "pdf-to-book"); + addEndpointToGroup("CLI", "pdf-to-rtf"); // Calibre addEndpointToGroup("Calibre", "book-to-pdf"); @@ -175,7 +175,7 @@ public class EndpointConfiguration { addEndpointToGroup("LibreOffice", "xlsx-to-pdf"); addEndpointToGroup("LibreOffice", "pdf-to-word"); addEndpointToGroup("LibreOffice", "pdf-to-presentation"); - addEndpointToGroup("LibreOffice", "pdf-to-text"); + addEndpointToGroup("LibreOffice", "pdf-to-rtf"); addEndpointToGroup("LibreOffice", "pdf-to-html"); addEndpointToGroup("LibreOffice", "pdf-to-xml"); @@ -218,6 +218,7 @@ public class EndpointConfiguration { addEndpointToGroup("Java", "overlay-pdf"); addEndpointToGroup("Java", "split-pdf-by-sections"); addEndpointToGroup("Java", REMOVE_BLANKS); + addEndpointToGroup("Java", "pdf-to-text"); // Javascript addEndpointToGroup("Javascript", "pdf-organizer"); diff --git a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java index 119e0902..aec4e347 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java +++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java @@ -31,7 +31,8 @@ public class ConvertPDFToPDFA { summary = "Convert a PDF to a PDF/A", description = "This endpoint converts a PDF file to a PDF/A file. PDF/A is a format designed for long-term archiving of digital documents. Input:PDF Output:PDF Type:SISO") - public ResponseEntity pdfToPdfA(@ModelAttribute PdfToPdfARequest request) throws Exception { + public ResponseEntity pdfToPdfA(@ModelAttribute PdfToPdfARequest request) + throws Exception { MultipartFile inputFile = request.getFileInput(); String outputFormat = request.getOutputFormat(); diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java index a93b64f2..42a99850 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java @@ -1,27 +1,25 @@ package stirling.software.SPDF.controller.api.misc; +import java.awt.AlphaComposite; import java.awt.Color; +import java.awt.GradientPaint; +import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; import java.awt.image.BufferedImageOp; import java.awt.image.ConvolveOp; import java.awt.image.Kernel; -import java.awt.image.RescaleOp; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.IOException; import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.List; import java.util.Random; -import javax.imageio.ImageIO; - import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.pdmodel.PDPage; -import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.apache.pdfbox.pdmodel.common.PDRectangle; -import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory; +import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory; import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; @@ -29,16 +27,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import stirling.software.SPDF.model.api.PDFFile; +import stirling.software.SPDF.utils.PdfUtils; import stirling.software.SPDF.utils.WebResponseUtils; @RestController @@ -48,98 +47,38 @@ public class FakeScanControllerWIP { private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class); - // TODO - @Hidden - // @PostMapping(consumes = "multipart/form-data", value = "/fakeScan") - @Operation( - summary = "Repair a PDF file", - description = - "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.") - public ResponseEntity repairPdf(@ModelAttribute PDFFile request) throws IOException { + //TODO + //@PostMapping(consumes = "multipart/form-data", value = "/fake-scan") + //@Operation( + // summary = "Repair a PDF file", + // description = + // "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.") + public ResponseEntity fakeScan(@ModelAttribute PDFFile request) throws IOException { MultipartFile inputFile = request.getFileInput(); + // Load the PDF document PDDocument document = Loader.loadPDF(inputFile.getBytes()); - PDFRenderer pdfRenderer = new PDFRenderer(document); - pdfRenderer.setSubsamplingAllowed(true); - for (int page = 0; page < document.getNumberOfPages(); ++page) { - BufferedImage image = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB); - ImageIO.write(image, "png", new File("scanned-" + (page + 1) + ".png")); + PDFRenderer renderer = new PDFRenderer(document); + List images = new ArrayList<>(); + // Convert each page to an image + for (int i = 0; i < document.getNumberOfPages(); i++) { + BufferedImage image = renderer.renderImageWithDPI(i, 150, ImageType.GRAY); + images.add(processImage(image)); } document.close(); - // Constants - int scannedness = 90; // Value between 0 and 100 - int dirtiness = 0; // Value between 0 and 100 - - // Load the source image - BufferedImage sourceImage = ImageIO.read(new File("scanned-1.png")); - - // Create the destination image - BufferedImage destinationImage = - new BufferedImage( - sourceImage.getWidth(), sourceImage.getHeight(), sourceImage.getType()); - - // Apply a brightness and contrast effect based on the "scanned-ness" - float scaleFactor = 1.0f + (scannedness / 100.0f) * 0.5f; // Between 1.0 and 1.5 - float offset = scannedness * 1.5f; // Between 0 and 150 - BufferedImageOp op = new RescaleOp(scaleFactor, offset, null); - op.filter(sourceImage, destinationImage); - - // Apply a rotation effect - double rotationRequired = - Math.toRadians( - (new SecureRandom().nextInt(3 - 1) - + 1)); // Random angle between 1 and 3 degrees - double locationX = destinationImage.getWidth() / 2; - double locationY = destinationImage.getHeight() / 2; - AffineTransform tx = - AffineTransform.getRotateInstance(rotationRequired, locationX, locationY); - AffineTransformOp rotateOp = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR); - destinationImage = rotateOp.filter(destinationImage, null); - - // Apply a blur effect based on the "scanned-ness" - float blurIntensity = scannedness / 100.0f * 0.2f; // Between 0.0 and 0.2 - float[] matrix = { - blurIntensity, blurIntensity, blurIntensity, - blurIntensity, blurIntensity, blurIntensity, - blurIntensity, blurIntensity, blurIntensity - }; - BufferedImageOp blurOp = - new ConvolveOp(new Kernel(3, 3, matrix), ConvolveOp.EDGE_NO_OP, null); - destinationImage = blurOp.filter(destinationImage, null); - - // Add noise to the image based on the "dirtiness" - Random random = new SecureRandom(); - for (int y = 0; y < destinationImage.getHeight(); y++) { - for (int x = 0; x < destinationImage.getWidth(); x++) { - if (random.nextInt(100) < dirtiness) { - // Change the pixel color to black randomly based on the "dirtiness" - destinationImage.setRGB(x, y, Color.BLACK.getRGB()); - } - } - } - - // Save the image - ImageIO.write(destinationImage, "PNG", new File("scanned-1.png")); - - PDDocument documentOut = new PDDocument(); - for (int page = 1; page <= document.getNumberOfPages(); ++page) { - BufferedImage bim = ImageIO.read(new File("scanned-" + page + ".png")); - - // Adjust the dimensions of the page - PDPage pdPage = new PDPage(new PDRectangle(bim.getWidth() - 1, bim.getHeight() - 1)); - documentOut.addPage(pdPage); - - PDImageXObject pdImage = LosslessFactory.createFromImage(documentOut, bim); - PDPageContentStream contentStream = new PDPageContentStream(documentOut, pdPage); - - // Draw the image with a slight offset and enlarged dimensions - contentStream.drawImage(pdImage, -1, -1, bim.getWidth() + 2, bim.getHeight() + 2); - contentStream.close(); - } + // Create a new PDF document with the processed images ByteArrayOutputStream baos = new ByteArrayOutputStream(); - documentOut.save(baos); - documentOut.close(); + PDDocument newDocument = new PDDocument(); + for (BufferedImage img : images) { + // PDPageContentStream contentStream = new PDPageContentStream(newDocument, new + // PDPage()); + PDImageXObject pdImage = JPEGFactory.createFromImage(newDocument, img); + PdfUtils.addImageToDocument(newDocument, pdImage, "maintainAspectRatio", false); + } + + newDocument.save(baos); + newDocument.close(); // Return the optimized PDF as a response String outputFilename = @@ -148,4 +87,164 @@ public class FakeScanControllerWIP { + "_scanned.pdf"; return WebResponseUtils.boasToWebResponse(baos, outputFilename); } + + public BufferedImage processImage(BufferedImage image) { + // Rotation + + image = rotate(image); + // image = softenEdges(image, 5); + image = applyGaussianBlur(image, 0.5); + addGaussianNoise(image, 0.25); + image = linearStretch(image); + + return image; + } + + private BufferedImage rotate(BufferedImage image) { + + double rotationRequired = Math.toRadians(1.0); + double locationX = image.getWidth() / 2; + double locationY = image.getHeight() / 2; + AffineTransform tx = + AffineTransform.getRotateInstance(rotationRequired, locationX, locationY); + AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_BICUBIC); + return op.filter(image, null); + } + + private BufferedImage applyGaussianBlur(BufferedImage image, double sigma) { + int radius = 3; // Fixed radius size for simplicity + + int size = 2 * radius + 1; + float[] data = new float[size * size]; + double sum = 0.0; + + for (int i = -radius; i <= radius; i++) { + for (int j = -radius; j <= radius; j++) { + double xDistance = i * i; + double yDistance = j * j; + double g = Math.exp(-(xDistance + yDistance) / (2 * sigma * sigma)); + data[(i + radius) * size + j + radius] = (float) g; + sum += g; + } + } + + // Normalize the kernel + for (int i = 0; i < data.length; i++) { + data[i] /= sum; + } + + Kernel kernel = new Kernel(size, size, data); + BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null); + return op.filter(image, null); + } + + public BufferedImage softenEdges(BufferedImage image, int featherRadius) { + int width = image.getWidth(); + int height = image.getHeight(); + BufferedImage output = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2 = output.createGraphics(); + g2.drawImage(image, 0, 0, null); + g2.setComposite(AlphaComposite.DstIn); + g2.setPaint( + new GradientPaint( + 0, 0, new Color(0, 0, 0, 1f), 0, featherRadius, new Color(0, 0, 0, 0f))); + g2.fillRect(0, 0, width, featherRadius); // top edge + g2.setPaint( + new GradientPaint( + 0, + height - featherRadius, + new Color(0, 0, 0, 0f), + 0, + height, + new Color(0, 0, 0, 1f))); + g2.fillRect(0, height - featherRadius, width, featherRadius); // bottom edge + g2.setPaint( + new GradientPaint( + 0, 0, new Color(0, 0, 0, 1f), featherRadius, 0, new Color(0, 0, 0, 0f))); + g2.fillRect(0, 0, featherRadius, height); // left edge + g2.setPaint( + new GradientPaint( + width - featherRadius, + 0, + new Color(0, 0, 0, 0f), + width, + 0, + new Color(0, 0, 0, 1f))); + g2.fillRect(width - featherRadius, 0, featherRadius, height); // right edge + g2.dispose(); + + return output; + } + + private void addGaussianNoise(BufferedImage image, double strength) { + Random rand = new SecureRandom(); + int width = image.getWidth(); + int height = image.getHeight(); + + for (int i = 0; i < width; i++) { + for (int j = 0; j < height; j++) { + int rgba = image.getRGB(i, j); + int alpha = (rgba >> 24) & 0xff; + int red = (rgba >> 16) & 0xff; + int green = (rgba >> 8) & 0xff; + int blue = rgba & 0xff; + + // Apply Gaussian noise + red = (int) (red + rand.nextGaussian() * strength); + green = (int) (green + rand.nextGaussian() * strength); + blue = (int) (blue + rand.nextGaussian() * strength); + + // Clamping values to the 0-255 range + red = Math.min(Math.max(0, red), 255); + green = Math.min(Math.max(0, green), 255); + blue = Math.min(Math.max(0, blue), 255); + + image.setRGB(i, j, (alpha << 24) | (red << 16) | (green << 8) | blue); + } + } + } + + public BufferedImage linearStretch(BufferedImage image) { + int width = image.getWidth(); + int height = image.getHeight(); + int min = 255; + int max = 0; + + // First pass: find the min and max grayscale values + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + int rgb = image.getRGB(x, y); + int gray = + (int) + (((rgb >> 16) & 0xff) * 0.299 + + ((rgb >> 8) & 0xff) * 0.587 + + (rgb & 0xff) * 0.114); // Convert to grayscale + if (gray < min) min = gray; + if (gray > max) max = gray; + } + } + + // Second pass: stretch the histogram + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + int rgb = image.getRGB(x, y); + int alpha = (rgb >> 24) & 0xff; + int red = (rgb >> 16) & 0xff; + int green = (rgb >> 8) & 0xff; + int blue = rgb & 0xff; + + // Apply linear stretch to each channel + red = (int) (((red - min) / (float) (max - min)) * 255); + green = (int) (((green - min) / (float) (max - min)) * 255); + blue = (int) (((blue - min) / (float) (max - min)) * 255); + + // Set new RGB value maintaining the alpha channel + rgb = (alpha << 24) | (red << 16) | (green << 8) | blue; + image.setRGB(x, y, rgb); + } + } + + return image; + } } diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java new file mode 100644 index 00000000..66da699e --- /dev/null +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java @@ -0,0 +1,106 @@ +package stirling.software.SPDF.controller.api.misc; + +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; +import java.io.IOException; +import java.util.Arrays; + +import javax.imageio.ImageIO; +import javax.print.PrintService; +import javax.print.PrintServiceLookup; + +import org.apache.pdfbox.Loader; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.printing.PDFPageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import stirling.software.SPDF.model.api.misc.PrintFileRequest; + +@RestController +@RequestMapping("/api/v1/misc") +@Tag(name = "Misc", description = "Miscellaneous APIs") +public class PrintFileController { + + //TODO + //@PostMapping(value = "/print-file", consumes = "multipart/form-data") + //@Operation( + // summary = "Prints PDF/Image file to a set printer", + // description = + // "Input of PDF or Image along with a printer name/URL/IP to match against to send it to (Fire and forget) Input:Any Output:N/A Type:SISO") + public ResponseEntity printFile(@ModelAttribute PrintFileRequest request) + throws IOException { + MultipartFile file = request.getFileInput(); + String printerName = request.getPrinterName(); + String contentType = file.getContentType(); + try { + // Find matching printer + PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null); + PrintService selectedService = + Arrays.stream(services) + .filter( + service -> + service.getName().toLowerCase().contains(printerName)) + .findFirst() + .orElseThrow( + () -> + new IllegalArgumentException( + "No matching printer found")); + + System.out.println("Selected Printer: " + selectedService.getName()); + + if ("application/pdf".equals(contentType)) { + PDDocument document = Loader.loadPDF(file.getBytes()); + PrinterJob job = PrinterJob.getPrinterJob(); + job.setPrintService(selectedService); + job.setPageable(new PDFPageable(document)); + job.print(); + document.close(); + } else if (contentType.startsWith("image/")) { + BufferedImage image = ImageIO.read(file.getInputStream()); + PrinterJob job = PrinterJob.getPrinterJob(); + job.setPrintService(selectedService); + job.setPrintable( + new Printable() { + public int print( + Graphics graphics, PageFormat pageFormat, int pageIndex) + throws PrinterException { + if (pageIndex != 0) { + return NO_SUCH_PAGE; + } + Graphics2D g2d = (Graphics2D) graphics; + g2d.translate( + pageFormat.getImageableX(), pageFormat.getImageableY()); + g2d.drawImage( + image, + 0, + 0, + (int) pageFormat.getImageableWidth(), + (int) pageFormat.getImageableHeight(), + null); + return PAGE_EXISTS; + } + }); + job.print(); + } + return new ResponseEntity<>( + "File printed successfully to " + selectedService.getName(), HttpStatus.OK); + } catch (Exception e) { + System.err.println("Failed to print: " + e.getMessage()); + return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST); + } + } +} diff --git a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java index b373d17a..0e1fdf55 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java @@ -54,6 +54,13 @@ public class OtherWebController { return "misc/add-page-numbers"; } + @GetMapping("/fake-scan") + @Hidden + public String fakeScanForm(Model model) { + model.addAttribute("currentPage", "fake-scan"); + return "misc/fake-scan"; + } + @GetMapping("/extract-images") @Hidden public String extractImagesForm(Model model) { @@ -82,6 +89,13 @@ public class OtherWebController { return "misc/compare"; } + @GetMapping("/print-file") + @Hidden + public String printFileForm(Model model) { + model.addAttribute("currentPage", "print-file"); + return "misc/print-file"; + } + public List getAvailableTesseractLanguages() { String tessdataDir = "/usr/share/tessdata"; File[] files = new File(tessdataDir).listFiles(); diff --git a/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java b/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java new file mode 100644 index 00000000..d91c7a9e --- /dev/null +++ b/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java @@ -0,0 +1,15 @@ +package stirling.software.SPDF.model.api.misc; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import stirling.software.SPDF.model.api.PDFFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class PrintFileRequest extends PDFFile { + + @Schema(description = "Name of printer to match against", required = true) + private String printerName; +} diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java index 24f51c6a..59a6877e 100644 --- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java +++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java @@ -336,7 +336,7 @@ public class PdfUtils { } } - private static void addImageToDocument( + public static void addImageToDocument( PDDocument doc, PDImageXObject image, String fitOption, boolean autoRotate) throws IOException { boolean imageIsLandscape = image.getWidth() > image.getHeight(); diff --git a/src/main/resources/templates/convert/pdf-to-text.html b/src/main/resources/templates/convert/pdf-to-text.html index 9877be8f..52d461e0 100644 --- a/src/main/resources/templates/convert/pdf-to-text.html +++ b/src/main/resources/templates/convert/pdf-to-text.html @@ -19,14 +19,13 @@
      -
      -

      +

      diff --git a/src/main/resources/templates/misc/fake-scan.html b/src/main/resources/templates/misc/fake-scan.html new file mode 100644 index 00000000..97d681a1 --- /dev/null +++ b/src/main/resources/templates/misc/fake-scan.html @@ -0,0 +1,29 @@ + + + + + + + + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      + +
      +
      +
      +
      +
      + +
      + + \ No newline at end of file diff --git a/src/main/resources/templates/misc/print-file.html b/src/main/resources/templates/misc/print-file.html new file mode 100644 index 00000000..056d7328 --- /dev/null +++ b/src/main/resources/templates/misc/print-file.html @@ -0,0 +1,35 @@ + + + + + + + + +
      +
      + +

      +
      +
      +
      +

      +
      +
      +
      +
      +

      Select Printer

      + + +
      +
      + +
      +
      +
      +
      +
      + +
      + + \ No newline at end of file diff --git a/test.sh b/test.sh index 660aff8c..e771a9b8 100644 --- a/test.sh +++ b/test.sh @@ -78,8 +78,8 @@ main() { # Building Docker images - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . + docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . # Test each configuration run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" @@ -94,8 +94,8 @@ main() { # Building Docker images with security enabled - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . - docker build --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . + docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . # Test each configuration with security run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" From 4c8f582c562eddd706a16b230f423d47dab03f3e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 23:08:06 +0100 Subject: [PATCH 159/200] :floppy_disk: Update Version (#1108) :floppy_disk: Sync Versions > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- chart/stirling-pdf/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml index 03e59424..dd5aa9c0 100644 --- a/chart/stirling-pdf/Chart.yaml +++ b/chart/stirling-pdf/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.22.8 +appVersion: 0.23.0 description: locally hosted web application that allows you to perform various operations on PDF files home: https://github.com/Stirling-Tools/Stirling-PDF From 95a9aca5b5129d19e26624d6013c67ce1385d823 Mon Sep 17 00:00:00 2001 From: diemade Date: Tue, 23 Apr 2024 23:32:12 +0200 Subject: [PATCH 160/200] Update CONTRIBUTING.md (#1115) adding a chapter on how to edit Docs --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3befe050..646bdddb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,6 +27,10 @@ Please make sure your Pull Request adheres to the following guidelines: If you would like to add or modify a translation, please see [How to add new languages to Stirling-PDF](HowToAddNewLanguage.md). Also, please create a Pull Request so others can use it! +## 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/). + ## Fixing Bugs or Adding a New Feature First, make sure you've read the section [Pull Requests](#pull-requests). From 6d859e4c251668ba7011617ae15684fc6cb873c2 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Tue, 23 Apr 2024 22:34:29 +0100 Subject: [PATCH 161/200] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 00000000..736e5893 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +stirlingtools.com \ No newline at end of file From c3e5157dee61cb0e7c74ef9a2fc8241bac470e89 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Tue, 23 Apr 2024 22:35:21 +0100 Subject: [PATCH 162/200] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 736e5893..00000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -stirlingtools.com \ No newline at end of file From 1b5d21a22ec0fed298a3188088ab2523a0862066 Mon Sep 17 00:00:00 2001 From: Ludy Date: Wed, 24 Apr 2024 10:10:16 +0200 Subject: [PATCH 163/200] Bugfix: Login page shows wrong selected country flag/language (#1117) Closes #1116 --- src/main/resources/templates/fragments/navbar.html | 2 +- src/main/resources/templates/login.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 4d67edb6..306eaed8 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -211,7 +211,7 @@
      - +
      diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 02c9cfed..7deb22b1 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -52,7 +52,7 @@ document.addEventListener('DOMContentLoaded', function() { - const defaultLocale = document.documentElement.getAttribute('language') || 'en_GB'; + const defaultLocale = document.documentElement.getAttribute('data-language') || 'en_GB'; const storedLocale = localStorage.getItem('languageCode') || defaultLocale; const currentURL = new URL(window.location.href); From 5ee702f364c90c9c253d6927bf21797442743d53 Mon Sep 17 00:00:00 2001 From: phfuh <136272363+phfuh@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:56:35 +0200 Subject: [PATCH 164/200] PDF to PDF/A language files (#1118) * Update messages_en_GB.properties * Update messages_en_US.properties * Update messages_de_DE.properties --- src/main/resources/messages_de_DE.properties | 1 + src/main/resources/messages_en_GB.properties | 1 + src/main/resources/messages_en_US.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 7837b6b9..a902dce7 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF zu PDF/A pdfToPDFA.credit=Dieser Dienst verwendet OCRmyPDF für die PDF/A-Konvertierung pdfToPDFA.submit=Konvertieren pdfToPDFA.tip=Dieser Dienst kann nur einzelne Eingangsdateien verarbeiten. +pdfToPDFA.outputFormat=Ausgabeformat #PDFToWord diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 30bcb9fd..08631ec0 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF To PDF/A pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion pdfToPDFA.submit=Convert pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 3f0c7afb..ab06056a 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF To PDF/A pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion pdfToPDFA.submit=Convert pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord From 34c7ee46a0cb161923247344a02877df713996ac Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Wed, 24 Apr 2024 19:59:01 +0100 Subject: [PATCH 165/200] lang adds --- .../api/misc/FakeScanControllerWIP.java | 73 ++++++++++++++++--- src/main/resources/messages_ar_AR.properties | 1 + src/main/resources/messages_bg_BG.properties | 1 + src/main/resources/messages_ca_CA.properties | 1 + src/main/resources/messages_el_GR.properties | 1 + src/main/resources/messages_es_ES.properties | 1 + src/main/resources/messages_eu_ES.properties | 1 + src/main/resources/messages_fr_FR.properties | 1 + src/main/resources/messages_hi_IN.properties | 1 + src/main/resources/messages_hu_HU.properties | 1 + src/main/resources/messages_id_ID.properties | 1 + src/main/resources/messages_it_IT.properties | 1 + src/main/resources/messages_ja_JP.properties | 1 + src/main/resources/messages_ko_KR.properties | 1 + src/main/resources/messages_nl_NL.properties | 1 + src/main/resources/messages_pl_PL.properties | 1 + src/main/resources/messages_pt_BR.properties | 1 + src/main/resources/messages_pt_PT.properties | 1 + src/main/resources/messages_ro_RO.properties | 1 + src/main/resources/messages_ru_RU.properties | 1 + .../resources/messages_sr_LATN_RS.properties | 1 + src/main/resources/messages_sv_SE.properties | 1 + src/main/resources/messages_tr_TR.properties | 1 + src/main/resources/messages_uk_UA.properties | 1 + src/main/resources/messages_zh_CN.properties | 1 + src/main/resources/messages_zh_TW.properties | 1 + 26 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java index 42a99850..834c8711 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java @@ -1,10 +1,14 @@ package stirling.software.SPDF.controller.api.misc; import java.awt.AlphaComposite; +import java.awt.BasicStroke; import java.awt.Color; import java.awt.GradientPaint; import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.geom.AffineTransform; +import java.awt.geom.Ellipse2D; +import java.awt.geom.Path2D; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; import java.awt.image.BufferedImageOp; @@ -47,12 +51,11 @@ public class FakeScanControllerWIP { private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class); - //TODO - //@PostMapping(consumes = "multipart/form-data", value = "/fake-scan") - //@Operation( - // summary = "Repair a PDF file", - // description = - // "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.") + @PostMapping(consumes = "multipart/form-data", value = "/fake-scan") + @Operation( + summary = "Repair a PDF file", + description = + "This endpoint repairs a given PDF file by running Ghostscript command. The PDF is first saved to a temporary location, repaired, read back, and then returned as a response.") public ResponseEntity fakeScan(@ModelAttribute PDFFile request) throws IOException { MultipartFile inputFile = request.getFileInput(); @@ -91,18 +94,20 @@ public class FakeScanControllerWIP { public BufferedImage processImage(BufferedImage image) { // Rotation - image = rotate(image); + addDustAndHairs(image, 50); + // image = rotate(image, 1); + // image = softenEdges(image, 5); image = applyGaussianBlur(image, 0.5); - addGaussianNoise(image, 0.25); + addGaussianNoise(image, 0.8); image = linearStretch(image); return image; } - private BufferedImage rotate(BufferedImage image) { + private BufferedImage rotate(BufferedImage image, double rotation) { - double rotationRequired = Math.toRadians(1.0); + double rotationRequired = Math.toRadians(rotation); double locationX = image.getWidth() / 2; double locationY = image.getHeight() / 2; AffineTransform tx = @@ -144,6 +149,11 @@ public class FakeScanControllerWIP { BufferedImage output = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D g2 = output.createGraphics(); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + g2.setRenderingHint( + RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + g2.drawImage(image, 0, 0, null); g2.setComposite(AlphaComposite.DstIn); g2.setPaint( @@ -177,6 +187,49 @@ public class FakeScanControllerWIP { return output; } + private void addDustAndHairs(BufferedImage image, float intensity) { + int width = image.getWidth(); + int height = image.getHeight(); + Graphics2D g2d = image.createGraphics(); + Random random = new SecureRandom(); + + // Set rendering hints for better quality + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + + // Calculate the number of artifacts based on intensity + int numSpots = (int) (intensity * 10); + int numHairs = (int) (intensity * 20); + + // Add spots with more variable sizes + g2d.setColor(new Color(100, 100, 100, 50)); // Semi-transparent gray + for (int i = 0; i < numSpots; i++) { + int x = random.nextInt(width); + int y = random.nextInt(height); + int ovalSize = 1 + random.nextInt(3); // Base size + variable component + if (random.nextFloat() > 0.9) { + // 10% chance to get a larger spot + ovalSize += random.nextInt(3); + } + g2d.fill(new Ellipse2D.Double(x, y, ovalSize, ovalSize)); + } + + // Add hairs + g2d.setStroke(new BasicStroke(0.5f)); // Thin stroke for hairs + g2d.setColor(new Color(80, 80, 80, 40)); // Slightly lighter and more transparent + for (int i = 0; i < numHairs; i++) { + int x1 = random.nextInt(width); + int y1 = random.nextInt(height); + int x2 = x1 + random.nextInt(20) - 10; // Random length and direction + int y2 = y1 + random.nextInt(20) - 10; + Path2D.Double hair = new Path2D.Double(); + hair.moveTo(x1, y1); + hair.curveTo(x1, y1, (x1 + x2) / 2, (y1 + y2) / 2, x2, y2); + g2d.draw(hair); + } + + g2d.dispose(); + } + private void addGaussianNoise(BufferedImage image, double strength) { Random rand = new SecureRandom(); int width = image.getWidth(); diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index ac90792a..9591a3ed 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF إلى PDF / A pdfToPDFA.credit=تستخدم هذه الخدمة OCRmyPDF لتحويل PDF / A. pdfToPDFA.submit=تحويل pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 6262d46d..ce3f8d60 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF към PDF/A pdfToPDFA.credit=Тази услуга използва OCRmyPDF за PDF/A преобразуване. pdfToPDFA.submit=Преобразуване pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 6071b16b..2a57ac2c 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF a PDF/A pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A pdfToPDFA.submit=Converteix pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 93ab31e2..452dcc12 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF σε PDF/A pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί OCRmyPDF για PDF/A μετατροπή pdfToPDFA.submit=Μετατροπή pdfToPDFA.tip=Προς το παρόν δεν λειτουργεί για πολλαπλές εισόδους ταυτόχρονα +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 867df9ac..4255b8e5 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF a PDF/A pdfToPDFA.credit=Este servicio usa OCRmyPDF para la conversión a PDF/A pdfToPDFA.submit=Convertir pdfToPDFA.tip=Actualmente no funciona para múltiples entrada a la vez +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 1f8f6b6d..2585b35b 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDFa PDF/A bihurtu pdfToPDFA.credit=Zerbitzu honek OCRmyPDF erabiltzen du PDFak PDF/A bihurtzeko pdfToPDFA.submit=Bihurtu pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 3aa55d09..0ca7afc2 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF en PDF/A pdfToPDFA.credit=Ce service utilise OCRmyPDF pour la conversion en PDF/A. pdfToPDFA.submit=Convertir pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index b660d678..d10f61c3 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF से PDF/A में pdfToPDFA.credit=इस सेवा में PDF/A परिवर्तन के लिए OCRmyPDF का उपयोग किया जाता है। pdfToPDFA.submit=परिवर्तित करें pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index c9a4957b..4aa381f1 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF >> PDF/A pdfToPDFA.credit=Ez a szolgáltatás az OCRmyPDF-t használja a PDF/A konverzióhoz pdfToPDFA.submit=Konvertálás pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index 3cbcc872..e0c4bdf7 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF ke PDF/A pdfToPDFA.credit=Layanan ini menggunakan OCRmyPDF untuk konversi PDF/A. pdfToPDFA.submit=Konversi pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 140a27f7..2456c454 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=Da PDF a PDF/A pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A. pdfToPDFA.submit=Converti pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index fed17883..1d208b2e 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDFをPDF/Aに変換 pdfToPDFA.credit=本サービスはPDF/Aの変換にOCRmyPDFを使用しています。 pdfToPDFA.submit=変換 pdfToPDFA.tip=現在、一度に複数の入力に対して機能しません +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 3b1d3441..282d6801 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF 문서를 PDF/A로 변환 pdfToPDFA.credit=이 서비스는 PDF/A 변환을 위해 OCRmyPDF 문서를 사용합니다. pdfToPDFA.submit=변환 pdfToPDFA.tip=현재 한 번에 여러 입력에 대해 작동하지 않습니다. +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index e5668210..a80c4eb4 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF naar PDF/A pdfToPDFA.credit=Deze service gebruikt OCRmyPDF voor PDF/A-conversie pdfToPDFA.submit=Converteren pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index c94f72cb..20a12405 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF na PDF/A pdfToPDFA.credit=Ta usługa używa OCRmyPDF do konwersji PDF/A pdfToPDFA.submit=Konwertuj pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index b03402be..b615f286 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF para PDF/A pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A pdfToPDFA.submit=Converter pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index c1662afe..4e2b196a 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF para PDF/A pdfToPDFA.credit=Este serviço usa OCRmyPDF para Conversão de PDF/A pdfToPDFA.submit=Converter pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 949f34cf..94fff40d 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF către PDF/A pdfToPDFA.credit=Acest serviciu utilizează OCRmyPDF pentru conversia în PDF/A pdfToPDFA.submit=Convert pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 3d20fc0b..446ab288 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF в PDF/A pdfToPDFA.credit=Этот сервис использует OCRmyPDF для преобразования PDF/A pdfToPDFA.submit=Конвертировать pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 7cdd2f24..03a10d77 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF u PDF/A pdfToPDFA.credit=Ova usluga koristi OCRmyPDF za konverziju u PDF/A format pdfToPDFA.submit=Konvertuj pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index afa34270..445bce87 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF till PDF/A pdfToPDFA.credit=Denna tjänst använder OCRmyPDF för PDF/A-konvertering pdfToPDFA.submit=Konvertera pdfToPDFA.tip=Currently does not work for multiple inputs at once +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 2ec0bd6b..5d5c70f4 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF'den PDF/A'ya pdfToPDFA.credit=Bu hizmet PDF/A dönüşümü için OCRmyPDF kullanır pdfToPDFA.submit=Dönüştür pdfToPDFA.tip=Şu anda aynı anda birden fazla giriş için çalışmıyor +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index 8a77d064..b4ad1f42 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF в PDF/A pdfToPDFA.credit=Цей сервіс використовує OCRmyPDF для перетворення у формат PDF/A pdfToPDFA.submit=Конвертувати pdfToPDFA.tip=Наразі не працює для кількох вхідних файлів одночасно +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index f10f3930..8c38e232 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF转换为PDF/A pdfToPDFA.credit=此服务使用OCRmyPDF进行PDF/A转换 pdfToPDFA.submit=转换 pdfToPDFA.tip=目前不支持上传多个 +pdfToPDFA.outputFormat=Output format #PDFToWord diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index c2cfbadb..70aaff46 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -941,6 +941,7 @@ pdfToPDFA.header=PDF 轉 PDF/A pdfToPDFA.credit=此服務使用 OCRmyPDF 進行 PDF/A 轉換 pdfToPDFA.submit=轉換 pdfToPDFA.tip=目前不支援上傳多個 +pdfToPDFA.outputFormat=Output format #PDFToWord From 2a9fdff605d1f92b0c698dd1b76f0a462eb5dbab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:59:53 +0100 Subject: [PATCH 166/200] :memo: Update README: Translation Progress Table (#1119) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62eb14f0..70c87568 100644 --- a/README.md +++ b/README.md @@ -182,12 +182,12 @@ Stirling PDF currently supports 27! | Basque (Euskara) (eu_ES) | ![75%](https://geps.dev/progress/75) | | Japanese (日本語) (ja_JP) | ![93%](https://geps.dev/progress/93) | | Dutch (Nederlands) (nl_NL) | ![91%](https://geps.dev/progress/91) | -| Greek (Ελληνικά) (el_GR) | ![92%](https://geps.dev/progress/92) | +| Greek (Ελληνικά) (el_GR) | ![91%](https://geps.dev/progress/91) | | Turkish (Türkçe) (tr_TR) | ![99%](https://geps.dev/progress/99) | -| Indonesia (Bahasa Indonesia) (id_ID) | ![87%](https://geps.dev/progress/87) | +| Indonesia (Bahasa Indonesia) (id_ID) | ![86%](https://geps.dev/progress/86) | | Hindi (हिंदी) (hi_IN) | ![87%](https://geps.dev/progress/87) | | Hungarian (Magyar) (hu_HU) | ![86%](https://geps.dev/progress/86) | -| Bulgarian (Български) (bg_BG) | ![82%](https://geps.dev/progress/82) | +| Bulgarian (Български) (bg_BG) | ![81%](https://geps.dev/progress/81) | | Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![88%](https://geps.dev/progress/88) | | Ukrainian (Українська) (uk_UA) | ![93%](https://geps.dev/progress/93) | From afaec64afd170be21dd83ef1bc5f2e7f3e48b78a Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Wed, 24 Apr 2024 22:57:56 +0200 Subject: [PATCH 167/200] Update messages_it_IT.properties (#1120) --- src/main/resources/messages_it_IT.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 2456c454..55f614cc 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -646,7 +646,7 @@ removeBlanks.submit=Rimuovi #removeAnnotations removeAnnotations.title=Rimuovi Annotazioni -removeAnnotations.header=Remuovi Annotazioni +removeAnnotations.header=Rimuovi Annotazioni removeAnnotations.submit=Rimuovi From 70349d642b99e5d3b0c79f280c63351440762464 Mon Sep 17 00:00:00 2001 From: Han <120943043+HNPorts@users.noreply.github.com> Date: Fri, 26 Apr 2024 21:37:09 +0300 Subject: [PATCH 168/200] Update messages_tr_TR.properties (#1126) * Update messages_tr_TR.properties * Update messages_tr_TR.properties --- src/main/resources/messages_tr_TR.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 5d5c70f4..90782f90 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -66,7 +66,7 @@ seeDockerHub=Docker Hub'a bakın visitGithub=Github Deposunu Ziyaret Edin donate=Bağış Yapın color=Renk -sponsor=Sponsor +sponsor=Bağış @@ -112,7 +112,7 @@ navbar.settings=Ayarlar ############# settings.title=Ayarlar settings.update=Güncelleme mevcut -settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. +settings.updateAvailable={0} mevcut kurulu sürümdür. Yeni bir sürüm ({1}) mevcuttur. settings.appVersion=Uygulama Sürümü: settings.downloadOption.title=İndirme seçeneği seçin (Zip olmayan tek dosya indirmeler için): settings.downloadOption.1=Aynı pencerede aç @@ -666,7 +666,7 @@ BookToPDF.submit=Dönüştür #PDFToBook PDFToBook.title=PDF'den Kitaba PDFToBook.header=PDF'den Kitaba -PDFToBook.selectText.1=Format +PDFToBook.selectText.1=Format biçimi PDFToBook.credit=Kalibre Kullanır PDFToBook.submit=Dönüştür @@ -941,7 +941,7 @@ pdfToPDFA.header=PDF'den PDF/A'ya pdfToPDFA.credit=Bu hizmet PDF/A dönüşümü için OCRmyPDF kullanır pdfToPDFA.submit=Dönüştür pdfToPDFA.tip=Şu anda aynı anda birden fazla giriş için çalışmıyor -pdfToPDFA.outputFormat=Output format +pdfToPDFA.outputFormat=Çıkış formatı #PDFToWord From 30444fc9bbbe478054ee495db4dc3084e8a18964 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 26 Apr 2024 23:27:40 +0100 Subject: [PATCH 169/200] commit (#1128) * commit * formatting --- README.md | 2 +- .../api/misc/FakeScanControllerWIP.java | 51 +++++++++++++------ .../api/misc/PrintFileController.java | 11 ++-- .../software/SPDF/utils/PdfUtils.java | 2 - .../resources/templates/fragments/navbar.html | 8 +-- 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 70c87568..3e22e201 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ Stirling PDF allows easy customization of the app. Includes things like - Custom application name -- Custom slogans, icons, images, and even custom HTML (via file overrides) +- Custom slogans, icons, images css etc (via file overrides) (Does not currently support html) There are two options for this, either using the generated settings file ``settings.yml`` This file is located in the ``/configs`` directory and follows standard YAML formatting diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java index 834c8711..2400c0d3 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java @@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -51,7 +52,9 @@ public class FakeScanControllerWIP { private static final Logger logger = LoggerFactory.getLogger(FakeScanControllerWIP.class); + // TODO finish @PostMapping(consumes = "multipart/form-data", value = "/fake-scan") + @Hidden @Operation( summary = "Repair a PDF file", description = @@ -94,14 +97,13 @@ public class FakeScanControllerWIP { public BufferedImage processImage(BufferedImage image) { // Rotation - addDustAndHairs(image, 50); - // image = rotate(image, 1); + image = softenEdges(image, 50); + image = rotate(image, 1); - // image = softenEdges(image, 5); image = applyGaussianBlur(image, 0.5); - addGaussianNoise(image, 0.8); + addGaussianNoise(image, 0.5); image = linearStretch(image); - + addDustAndHairs(image, 3); return image; } @@ -156,32 +158,51 @@ public class FakeScanControllerWIP { g2.drawImage(image, 0, 0, null); g2.setComposite(AlphaComposite.DstIn); - g2.setPaint( - new GradientPaint( - 0, 0, new Color(0, 0, 0, 1f), 0, featherRadius, new Color(0, 0, 0, 0f))); - g2.fillRect(0, 0, width, featherRadius); // top edge + + // Top edge g2.setPaint( new GradientPaint( 0, - height - featherRadius, + 0, + new Color(0, 0, 0, 1f), + 0, + featherRadius * 2, + new Color(0, 0, 0, 0f))); + g2.fillRect(0, 0, width, featherRadius); + + // Bottom edge + g2.setPaint( + new GradientPaint( + 0, + height - featherRadius * 2, new Color(0, 0, 0, 0f), 0, height, new Color(0, 0, 0, 1f))); - g2.fillRect(0, height - featherRadius, width, featherRadius); // bottom edge + g2.fillRect(0, height - featherRadius, width, featherRadius); + + // Left edge g2.setPaint( new GradientPaint( - 0, 0, new Color(0, 0, 0, 1f), featherRadius, 0, new Color(0, 0, 0, 0f))); - g2.fillRect(0, 0, featherRadius, height); // left edge + 0, + 0, + new Color(0, 0, 0, 1f), + featherRadius * 2, + 0, + new Color(0, 0, 0, 0f))); + g2.fillRect(0, 0, featherRadius, height); + + // Right edge g2.setPaint( new GradientPaint( - width - featherRadius, + width - featherRadius * 2, 0, new Color(0, 0, 0, 0f), width, 0, new Color(0, 0, 0, 1f))); - g2.fillRect(width - featherRadius, 0, featherRadius, height); // right edge + g2.fillRect(width - featherRadius, 0, featherRadius, height); + g2.dispose(); return output; diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java index 66da699e..bc0a6715 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java @@ -20,12 +20,10 @@ import org.apache.pdfbox.printing.PDFPageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import stirling.software.SPDF.model.api.misc.PrintFileRequest; @@ -35,12 +33,13 @@ import stirling.software.SPDF.model.api.misc.PrintFileRequest; @Tag(name = "Misc", description = "Miscellaneous APIs") public class PrintFileController { - //TODO - //@PostMapping(value = "/print-file", consumes = "multipart/form-data") - //@Operation( + // TODO + // @PostMapping(value = "/print-file", consumes = "multipart/form-data") + // @Operation( // summary = "Prints PDF/Image file to a set printer", // description = - // "Input of PDF or Image along with a printer name/URL/IP to match against to send it to (Fire and forget) Input:Any Output:N/A Type:SISO") + // "Input of PDF or Image along with a printer name/URL/IP to match against to + // send it to (Fire and forget) Input:Any Output:N/A Type:SISO") public ResponseEntity printFile(@ModelAttribute PrintFileRequest request) throws IOException { MultipartFile file = request.getFileInput(); diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java index 59a6877e..225a2c12 100644 --- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java +++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java @@ -342,8 +342,6 @@ public class PdfUtils { boolean imageIsLandscape = image.getWidth() > image.getHeight(); PDRectangle pageSize = PDRectangle.A4; - System.out.println(fitOption); - if (autoRotate && imageIsLandscape) { pageSize = new PDRectangle(pageSize.getHeight(), pageSize.getWidth()); } diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 306eaed8..8b412a6b 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -17,20 +17,20 @@
      Login Via SSO +
      +
      OAUTH2 Auto-Create User Disabled.
      +
      +
      +

      Please sign in

      From 32dd328048ef11a1e7d395bd441081b2c4474d52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:05:54 +0100 Subject: [PATCH 177/200] Update 3rd Party Licenses (#1144) Signed-off-by: GitHub Action Co-authored-by: GitHub Action --- .../resources/static/3rdPartyLicenses.json | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index aefd5079..97025001 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -81,6 +81,13 @@ "moduleLicense": "GNU Lesser General Public License v3 (LGPL-v3)", "moduleLicenseUrl": "http://www.gnu.org/licenses/lgpl-3.0.html" }, + { + "moduleName": "com.github.stephenc.jcip:jcip-annotations", + "moduleUrl": "http://stephenc.github.com/jcip-annotations", + "moduleVersion": "1.0-1", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, { "moduleName": "com.github.vladimir-bukhtoyarov:bucket4j-core", "moduleUrl": "http://github.com/vladimir-bukhtoyarov/bucket4j/bucket4j-core", @@ -109,6 +116,34 @@ "moduleLicense": "LGPL", "moduleLicenseUrl": "http://www.martiansoftware.com/jsap/license.html" }, + { + "moduleName": "com.nimbusds:content-type", + "moduleUrl": "https://connect2id.com", + "moduleVersion": "2.2", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" + }, + { + "moduleName": "com.nimbusds:lang-tag", + "moduleUrl": "https://connect2id.com/", + "moduleVersion": "1.7", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" + }, + { + "moduleName": "com.nimbusds:nimbus-jose-jwt", + "moduleUrl": "https://connect2id.com", + "moduleVersion": "9.24.4", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" + }, + { + "moduleName": "com.nimbusds:oauth2-oidc-sdk", + "moduleUrl": "https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions", + "moduleVersion": "9.43.3", + "moduleLicense": "Apache License, version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.html" + }, { "moduleName": "com.opencsv:opencsv", "moduleUrl": "http://opencsv.sf.net", @@ -335,6 +370,20 @@ "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, + { + "moduleName": "net.minidev:accessors-smart", + "moduleUrl": "https://urielch.github.io/", + "moduleVersion": "2.5.0", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, + { + "moduleName": "net.minidev:json-smart", + "moduleUrl": "https://urielch.github.io/", + "moduleVersion": "2.5.0", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, { "moduleName": "org.antlr:antlr4-runtime", "moduleUrl": "https://www.antlr.org/", @@ -547,6 +596,13 @@ "moduleLicense": "Public Domain, per Creative Commons CC0", "moduleLicenseUrl": "http://creativecommons.org/publicdomain/zero/1.0/" }, + { + "moduleName": "org.ow2.asm:asm", + "moduleUrl": "http://asm.ow2.org", + "moduleVersion": "9.3", + "moduleLicense": "The Apache Software License, Version 2.0", + "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" + }, { "moduleName": "org.slf4j:jul-to-slf4j", "moduleUrl": "http://www.slf4j.org", @@ -663,6 +719,13 @@ "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, + { + "moduleName": "org.springframework.boot:spring-boot-starter-oauth2-client", + "moduleUrl": "https://spring.io/projects/spring-boot", + "moduleVersion": "3.2.4", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, { "moduleName": "org.springframework.boot:spring-boot-starter-security", "moduleUrl": "https://spring.io/projects/spring-boot", @@ -726,6 +789,27 @@ "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, + { + "moduleName": "org.springframework.security:spring-security-oauth2-client", + "moduleUrl": "https://spring.io/projects/spring-security", + "moduleVersion": "6.2.3", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, + { + "moduleName": "org.springframework.security:spring-security-oauth2-core", + "moduleUrl": "https://spring.io/projects/spring-security", + "moduleVersion": "6.2.3", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, + { + "moduleName": "org.springframework.security:spring-security-oauth2-jose", + "moduleUrl": "https://spring.io/projects/spring-security", + "moduleVersion": "6.2.3", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, { "moduleName": "org.springframework.security:spring-security-web", "moduleUrl": "https://spring.io/projects/spring-security", From b71f6f93b1c02caef17ffbad557a1c3178fcc736 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Tue, 30 Apr 2024 01:02:15 -0600 Subject: [PATCH 178/200] Add translations for OAUTH2 Related Text (#1146) --- src/main/resources/messages_ar_AR.properties | 2 ++ src/main/resources/messages_bg_BG.properties | 2 ++ src/main/resources/messages_ca_CA.properties | 2 ++ src/main/resources/messages_de_DE.properties | 2 ++ src/main/resources/messages_el_GR.properties | 2 ++ src/main/resources/messages_es_ES.properties | 2 ++ src/main/resources/messages_eu_ES.properties | 2 ++ src/main/resources/messages_fr_FR.properties | 2 ++ src/main/resources/messages_hi_IN.properties | 2 ++ src/main/resources/messages_hu_HU.properties | 2 ++ src/main/resources/messages_id_ID.properties | 2 ++ src/main/resources/messages_it_IT.properties | 2 ++ src/main/resources/messages_ja_JP.properties | 2 ++ src/main/resources/messages_ko_KR.properties | 2 ++ src/main/resources/messages_nl_NL.properties | 2 ++ src/main/resources/messages_pl_PL.properties | 2 ++ src/main/resources/messages_pt_BR.properties | 2 ++ src/main/resources/messages_pt_PT.properties | 2 ++ src/main/resources/messages_ro_RO.properties | 2 ++ src/main/resources/messages_ru_RU.properties | 2 ++ src/main/resources/messages_sr_LATN_RS.properties | 2 ++ src/main/resources/messages_sv_SE.properties | 2 ++ src/main/resources/messages_tr_TR.properties | 2 ++ src/main/resources/messages_uk_UA.properties | 2 ++ src/main/resources/messages_zh_CN.properties | 2 ++ src/main/resources/messages_zh_TW.properties | 2 ++ 26 files changed, 52 insertions(+) diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 9591a3ed..89e681b5 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -437,6 +437,8 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in +login.ssoSignIn=تسجيل الدخول عبر تسجيل الدخول الأحادي +login.oauth2AutoCreateDisabled=تم تعطيل مستخدم الإنشاء التلقائي لـ OAuth2 #auto-redact diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index ce3f8d60..80b249cf 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -437,6 +437,8 @@ login.rememberme=Запомни ме login.invalid=Невалидно потребителско име или парола. login.locked=Вашият акаунт е заключен. login.signinTitle=Моля впишете се +login.ssoSignIn=Влизане чрез еднократно влизане +login.oauth2AutoCreateDisabled=OAUTH2 Автоматично създаване на потребител е деактивирано #auto-redact diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 2a57ac2c..823cbfff 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -437,6 +437,8 @@ login.rememberme=Recordar login.invalid=Nom usuari / password no vàlid login.locked=Compte bloquejat login.signinTitle=Autenticat +login.ssoSignIn=Inicia sessió mitjançant l'inici de sessió ún +login.oauth2AutoCreateDisabled=L'usuari de creació automàtica OAUTH2 està desactivat #auto-redact diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index a902dce7..5bc1182f 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -437,6 +437,8 @@ login.rememberme=Angemeldet bleiben login.invalid=Benutzername oder Passwort ungültig. login.locked=Ihr Konto wurde gesperrt. login.signinTitle=Bitte melden Sie sich an. +login.ssoSignIn=Anmeldung per Single Sign-On +login.oauth2AutoCreateDisabled=OAUTH2 Benutzer automatisch erstellen deaktiviert #auto-redact diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 452dcc12..216982c3 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -437,6 +437,8 @@ login.rememberme=Να Με Θυμάσαι login.invalid=Λάθος όνομα χρήστη ή κωδικού πρόσβασης. login.locked=Ο λογαριασμός σας έχει κλειδωθεί. login.signinTitle=Παρακαλώ, συνδεθείτε +login.ssoSignIn=Σύνδεση μέσω μοναδικής σύνδεσης +login.oauth2AutoCreateDisabled=Απενεργοποιήθηκε ο χρήστης αυτόματης δημιουργίας OAUTH2 #auto-redact diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 4255b8e5..663d7b63 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -437,6 +437,8 @@ login.rememberme=Recordarme login.invalid=Nombre de usuario o contraseña erróneos. login.locked=Su cuenta se ha bloqueado. login.signinTitle=Por favor, inicie sesión +login.ssoSignIn=Iniciar sesión a través del inicio de sesión único +login.oauth2AutoCreateDisabled=Usuario DE creación automática de OAUTH2 DESACTIVADO #auto-redact diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 2585b35b..28a26fb8 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -437,6 +437,8 @@ login.rememberme=Oroitu nazazu login.invalid=Okerreko erabiltzaile izena edo pasahitza. login.locked=Zure kontua blokeatu egin da. login.signinTitle=Mesedez, hasi saioa +login.ssoSignIn=Hasi saioa Saioa hasteko modu bakarraren bidez +login.oauth2AutoCreateDisabled=OAUTH2 Sortu automatikoki erabiltzailea desgaituta dago #auto-redact diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 0ca7afc2..722158aa 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -437,6 +437,8 @@ login.rememberme=Se souvenir de moi login.invalid=Nom d’utilisateur ou mot de passe invalide. login.locked=Votre compte a été verrouillé. login.signinTitle=Veuillez vous connecter +login.ssoSignIn=Se connecter via l'authentification unique +login.oauth2AutoCreateDisabled=OAUTH2 Création automatique d'utilisateur désactivée #auto-redact diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index d10f61c3..316902f1 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -437,6 +437,8 @@ login.rememberme=मुझे याद रखें login.invalid=अमान्य उपयोगकर्ता नाम या पासवर्ड। login.locked=आपका खाता लॉक कर दिया गया है। login.signinTitle=कृपया साइन इन करें +login.ssoSignIn=सिंगल साइन - ऑन के ज़रिए लॉग इन करें +login.oauth2AutoCreateDisabled=OAUTH2 ऑटो - क्रिएट यूज़र अक्षम किया गया #auto-redact diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 4aa381f1..957e2fe7 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -437,6 +437,8 @@ login.rememberme=Emlékezz rám login.invalid=Érvénytelen felhasználónév vagy jelszó! login.locked=A fiókja zárolva lett! login.signinTitle=Kérjük, jelentkezzen be! +login.ssoSignIn=Bejelentkezés egyszeri bejelentkezéssel +login.oauth2AutoCreateDisabled=OAUTH2 Felhasználó automatikus létrehozása letiltva #auto-redact diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index e0c4bdf7..476dd91a 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -437,6 +437,8 @@ login.rememberme=Ingat saya login.invalid=Nama pengguna atau kata sandi tidak valid. login.locked=Akun Anda telah dikunci. login.signinTitle=Silakan masuk +login.ssoSignIn=Masuk melalui Single Sign - on +login.oauth2AutoCreateDisabled=OAUTH2 Buat Otomatis Pengguna Dinonaktifkan #auto-redact diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 55f614cc..09ce43aa 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -437,6 +437,8 @@ login.rememberme=Ricordami login.invalid=Nome utente o password errati. login.locked=Il tuo account è stato bloccato. login.signinTitle=Per favore accedi +login.ssoSignIn=Accedi tramite Single Sign-on +login.oauth2AutoCreateDisabled=Creazione automatica utente OAUTH2 DISABILITATA #auto-redact diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 1d208b2e..4f142aa8 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -437,6 +437,8 @@ login.rememberme=サインイン状態を記憶する login.invalid=ユーザー名かパスワードが無効です。 login.locked=あなたのアカウントはロックされています。 login.signinTitle=サインインしてください +login.ssoSignIn=シングルサインオンでログイン +login.oauth2AutoCreateDisabled=OAuth 2自動作成ユーザーが無効 #auto-redact diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 282d6801..9f99ab10 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -437,6 +437,8 @@ login.rememberme=로그인 유지 login.invalid=사용자 이름이나 비밀번호가 틀립니다. login.locked=계정이 잠겼습니다. login.signinTitle=로그인해 주세요. +login.ssoSignIn=싱글사인온을 통한 로그인 +login.oauth2AutoCreateDisabled=OAUTH2 사용자 자동 생성 비활성화됨 #auto-redact diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index a80c4eb4..a82f1c2c 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -437,6 +437,8 @@ login.rememberme=Onthoud mij login.invalid=Ongeldige gebruikersnaam of wachtwoord. login.locked=Je account is geblokkeerd. login.signinTitle=Gelieve in te loggen +login.ssoSignIn=Inloggen via Single Sign-on +login.oauth2AutoCreateDisabled=OAUTH2 Automatisch aanmaken gebruiker uitgeschakeld #auto-redact diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 20a12405..4f8b5470 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -437,6 +437,8 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in +login.ssoSignIn=Zaloguj się za pomocą logowania jednokrotnego +login.oauth2AutoCreateDisabled=Wyłączono automatyczne tworzenie użytkownika OAUTH2 #auto-redact diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index b615f286..c6dc2215 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -437,6 +437,8 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in +login.ssoSignIn=Iniciar sessão através de início de sessão único +login.oauth2AutoCreateDisabled=OAUTH2 Auto-Criar Usuário Desativado #auto-redact diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index 4e2b196a..ecbeba35 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -437,6 +437,8 @@ login.rememberme=Lembrar dados login.invalid=Utilizador ou senha inválidos. login.locked=A sua conta foi bloqueada. login.signinTitle=Introduza os seus dados de acesso +login.ssoSignIn=Iniciar sessão através de início de sessão único +login.oauth2AutoCreateDisabled=OAUTH2 Criação Automática de Utilizador Desativada #auto-redact diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 94fff40d..573cce94 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -437,6 +437,8 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in +login.ssoSignIn=Conectare prin conectare unică +login.oauth2AutoCreateDisabled=OAUTH2 Creare automată utilizator dezactivată #auto-redact diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 446ab288..9a4c3428 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -437,6 +437,8 @@ login.rememberme=Запомнить меня login.invalid=Недействительное имя пользователя или пароль. login.locked=Ваша учетная запись заблокирована. login.signinTitle=Пожалуйста, войдите +login.ssoSignIn=Вход через единый вход +login.oauth2AutoCreateDisabled=OAUTH2 Автоматическое создание пользователя отключено #auto-redact diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 03a10d77..cf2613b0 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -437,6 +437,8 @@ login.rememberme=Zapamti me login.invalid=Neispravno korisničko ime ili lozinka. login.locked=Vaš nalog je zaključan. login.signinTitle=Molimo vas da se prijavite +login.ssoSignIn=Prijavite se putem jedinstvene prijave +login.oauth2AutoCreateDisabled=OAUTH2 automatsko kreiranje korisnika je onemogućeno #auto-redact diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index 445bce87..26ef9ecb 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -437,6 +437,8 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in +login.ssoSignIn=Logga in via enkel inloggning +login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User inaktiverad #auto-redact diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 90782f90..d5e02c13 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -437,6 +437,8 @@ login.rememberme=Beni hatırla login.invalid=Geçersiz kullanıcı adı veya şifre. login.locked=Hesabınız kilitlendi. login.signinTitle=Lütfen giriş yapınız. +login.ssoSignIn=Tek Oturum Açma ile Giriş Yap +login.oauth2AutoCreateDisabled=OAUTH2 Otomatik Oluşturma Kullanıcı Devre Dışı Bırakıldı #auto-redact diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index b4ad1f42..d5800ebc 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -437,6 +437,8 @@ login.rememberme=Запам'ятати мене login.invalid=Недійсне ім'я користувача або пароль. login.locked=Ваш обліковий запис заблоковано. login.signinTitle=Будь ласка, увійдіть +login.ssoSignIn=Увійти через єдиний вхід +login.oauth2AutoCreateDisabled=Автоматичне створення користувача OAUTH2 ВИМКНЕНО #auto-redact diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index 8c38e232..aefc95da 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -437,6 +437,8 @@ login.rememberme=记住我 login.invalid=用户名或密码无效。 login.locked=您的账户已被锁定。 login.signinTitle=请登录 +login.ssoSignIn=通过单点登录登录 +login.oauth2AutoCreateDisabled=OAUTH2自动创建用户已禁用 #auto-redact diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 70aaff46..54a73109 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -437,6 +437,8 @@ login.rememberme=記住我 login.invalid=使用者名稱或密碼無效。 login.locked=您的帳戶已被鎖定。 login.signinTitle=請登入 +login.ssoSignIn=透過織網單一簽入 +login.oauth2AutoCreateDisabled=OAUTH2自動建立使用者已停用 #auto-redact From d730c6a12fc6ecbeddf12255c81367a423d70310 Mon Sep 17 00:00:00 2001 From: t71rs <166131967+t71rs@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:02:12 +0200 Subject: [PATCH 179/200] Arrow key support signing (#1143) * Added Arrow Key functionality for the Sign page. * Added Arrow Key functionality for the Sign page. * Adjusted step size, so it is relative to the size of the draggable * Enabled Arrow Key support also for Add-Image --------- Co-authored-by: Eric <71648843+sbplat@users.noreply.github.com> --- .../resources/static/js/draggable-utils.js | 170 ++++++++++++------ 1 file changed, 120 insertions(+), 50 deletions(-) diff --git a/src/main/resources/static/js/draggable-utils.js b/src/main/resources/static/js/draggable-utils.js index bff4c3d4..6064e398 100644 --- a/src/main/resources/static/js/draggable-utils.js +++ b/src/main/resources/static/js/draggable-utils.js @@ -5,74 +5,130 @@ const DraggableUtils = { pdfDoc: null, pageIndex: 0, documentsMap: new Map(), + lastInteracted: null, init() { interact(".draggable-canvas") - .draggable({ - listeners: { - move: (event) => { - const target = event.target; - const x = (parseFloat(target.getAttribute("data-bs-x")) || 0) + event.dx; - const y = (parseFloat(target.getAttribute("data-bs-y")) || 0) + event.dy; + .draggable({ + listeners: { + move: (event) => { + const target = event.target; + const x = (parseFloat(target.getAttribute("data-bs-x")) || 0) + + event.dx; + const y = (parseFloat(target.getAttribute("data-bs-y")) || 0) + + event.dy; - target.style.transform = `translate(${x}px, ${y}px)`; - target.setAttribute("data-bs-x", x); - target.setAttribute("data-bs-y", y); + target.style.transform = `translate(${x}px, ${y}px)`; + target.setAttribute("data-bs-x", x); + target.setAttribute("data-bs-y", y); - this.onInteraction(target); - }, + this.onInteraction(target); + //update the last interacted element + this.lastInteracted = event.target; }, - }) - .resizable({ - edges: { left: true, right: true, bottom: true, top: true }, - listeners: { - move: (event) => { - var target = event.target; - var x = parseFloat(target.getAttribute("data-bs-x")) || 0; - var y = parseFloat(target.getAttribute("data-bs-y")) || 0; + }, + }) + .resizable({ + edges: { left: true, right: true, bottom: true, top: true }, + listeners: { + move: (event) => { + var target = event.target; + var x = parseFloat(target.getAttribute("data-bs-x")) || 0; + var y = parseFloat(target.getAttribute("data-bs-y")) || 0; - // check if control key is pressed - if (event.ctrlKey) { - const aspectRatio = target.offsetWidth / target.offsetHeight; - // preserve aspect ratio - let width = event.rect.width; - let height = event.rect.height; + // check if control key is pressed + if (event.ctrlKey) { + const aspectRatio = target.offsetWidth / target.offsetHeight; + // preserve aspect ratio + let width = event.rect.width; + let height = event.rect.height; - if (Math.abs(event.deltaRect.width) >= Math.abs(event.deltaRect.height)) { - height = width / aspectRatio; - } else { - width = height * aspectRatio; - } - - event.rect.width = width; - event.rect.height = height; + if (Math.abs(event.deltaRect.width) >= Math.abs( + event.deltaRect.height)) { + height = width / aspectRatio; + } else { + width = height * aspectRatio; } - target.style.width = event.rect.width + "px"; - target.style.height = event.rect.height + "px"; + event.rect.width = width; + event.rect.height = height; + } - // translate when resizing from top or left edges - x += event.deltaRect.left; - y += event.deltaRect.top; + target.style.width = event.rect.width + "px"; + target.style.height = event.rect.height + "px"; - target.style.transform = "translate(" + x + "px," + y + "px)"; + // translate when resizing from top or left edges + x += event.deltaRect.left; + y += event.deltaRect.top; - target.setAttribute("data-bs-x", x); - target.setAttribute("data-bs-y", y); - target.textContent = Math.round(event.rect.width) + "\u00D7" + Math.round(event.rect.height); + target.style.transform = "translate(" + x + "px," + y + "px)"; - this.onInteraction(target); - }, + target.setAttribute("data-bs-x", x); + target.setAttribute("data-bs-y", y); + target.textContent = Math.round(event.rect.width) + "\u00D7" + + Math.round(event.rect.height); + + this.onInteraction(target); }, + }, - modifiers: [ - interact.modifiers.restrictSize({ - min: { width: 5, height: 5 }, - }), - ], - inertia: true, + modifiers: [ + interact.modifiers.restrictSize({ + min: {width: 5, height: 5}, + }), + ], + inertia: true, + }); + //Arrow key Support for Add-Image and Sign pages + if(window.location.pathname.endsWith('sign') || window.location.pathname.endsWith('add-image')) { + window.addEventListener('keydown', (event) => { + //Check for last interacted element + if (!this.lastInteracted){ + return; + } + // Get the currently selected element + const target = this.lastInteracted; + + // Step size relatively to the elements size + const stepX = target.offsetWidth * 0.05; + const stepY = target.offsetHeight * 0.05; + + // Get the current x and y coordinates + let x = (parseFloat(target.getAttribute('data-bs-x')) || 0); + let y = (parseFloat(target.getAttribute('data-bs-y')) || 0); + + // Check which key was pressed and update the coordinates accordingly + switch (event.key) { + case 'ArrowUp': + y -= stepY; + event.preventDefault(); // Prevent the default action + break; + case 'ArrowDown': + y += stepY; + event.preventDefault(); + break; + case 'ArrowLeft': + x -= stepX; + event.preventDefault(); + break; + case 'ArrowRight': + x += stepX; + event.preventDefault(); + break; + default: + return; // Listen only to arrow keys + } + + // Update position + target.style.transform = `translate(${x}px, ${y}px)`; + target.setAttribute('data-bs-x', x); + target.setAttribute('data-bs-y', y); + + DraggableUtils.onInteraction(target); }); + } }, + onInteraction(target) { this.boxDragContainer.appendChild(target); }, @@ -88,9 +144,18 @@ const DraggableUtils = { createdCanvas.setAttribute("data-bs-x", x); createdCanvas.setAttribute("data-bs-y", y); + //Click element in order to enable arrow keys + createdCanvas.addEventListener('click', () => { + this.lastInteracted = createdCanvas; + }); + createdCanvas.onclick = (e) => this.onInteraction(e.target); this.boxDragContainer.appendChild(createdCanvas); + + //Enable Arrow keys directly after the element is created + this.lastInteracted = createdCanvas; + return createdCanvas; }, createDraggableCanvasFromUrl(dataUrl) { @@ -134,6 +199,11 @@ const DraggableUtils = { }, deleteDraggableCanvas(element) { if (element) { + //Check if deleted element is the last interacted + if (this.lastInteracted === element) { + // If it is, set lastInteracted to null + this.lastInteracted = null; + } element.remove(); } }, From 1c335008152223499e2103e9cffd2daed37d8cf8 Mon Sep 17 00:00:00 2001 From: Ludy Date: Wed, 1 May 2024 00:03:50 +0200 Subject: [PATCH 180/200] Update messages_de_DE.properties (#1149) --- src/main/resources/messages_de_DE.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 5bc1182f..a7c9bddf 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -46,7 +46,7 @@ green=Grün blue=Blau custom=benutzerdefiniert... WorkInProgess=In Arbeit, funktioniert möglicherweise nicht oder ist fehlerhaft. Bitte melden Sie alle Probleme! -poweredBy=Powered by +poweredBy=Unterstützt von yes=Ja no=Nein changedCredsMessage=Anmeldedaten geändert! @@ -121,9 +121,9 @@ settings.downloadOption.3=Datei herunterladen settings.zipThreshold=Dateien komprimieren, wenn die Anzahl der heruntergeladenen Dateien überschritten wird settings.signOut=Abmelden settings.accountSettings=Kontoeinstellungen -settings.bored.help=Enables easter egg game -settings.cacheInputs.name=Save form inputs -settings.cacheInputs.help=Enable to store previously used inputs for future runs +settings.bored.help=Aktiviert das Easter-Egg-Spiel +settings.cacheInputs.name=Formulareingaben speichern +settings.cacheInputs.help=Aktivieren, um zuvor verwendete Eingaben für zukünftige Durchläufe zu speichern changeCreds.title=Anmeldeinformationen ändern changeCreds.header=Aktualisieren Sie Ihre Kontodaten From d0df392eefc11376d737ec24ff1c842fc5c76707 Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Wed, 1 May 2024 00:04:05 +0200 Subject: [PATCH 181/200] Update messages_it_IT.properties (#1148) --- src/main/resources/messages_it_IT.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 09ce43aa..346f402b 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -943,7 +943,7 @@ pdfToPDFA.header=Da PDF a PDF/A pdfToPDFA.credit=Questo servizio utilizza OCRmyPDF per la conversione in PDF/A. pdfToPDFA.submit=Converti pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente -pdfToPDFA.outputFormat=Output format +pdfToPDFA.outputFormat=Formato di output #PDFToWord From c622ee915bf0af073d02d959ebc3f7b3e8dc2e11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:04:59 +0100 Subject: [PATCH 182/200] :memo: Update README: Translation Progress Table (#1151) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14593daf..db9ed2d4 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ Stirling PDF currently supports 27! | English (English) (en_GB) | ![100%](https://geps.dev/progress/100) | | English (US) (en_US) | ![100%](https://geps.dev/progress/100) | | Arabic (العربية) (ar_AR) | ![42%](https://geps.dev/progress/42) | -| German (Deutsch) (de_DE) | ![99%](https://geps.dev/progress/99) | +| German (Deutsch) (de_DE) | ![100%](https://geps.dev/progress/100) | | French (Français) (fr_FR) | ![91%](https://geps.dev/progress/91) | | Spanish (Español) (es_ES) | ![99%](https://geps.dev/progress/99) | | Simplified Chinese (简体中文) (zh_CN) | ![98%](https://geps.dev/progress/98) | From d7afc574a66a28bd4f20615032e46508b4f4222a Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Thu, 2 May 2024 14:52:50 -0600 Subject: [PATCH 183/200] Change User Roles (#1153) * Modify user service and controller * Modify Template * Add messages * Fix Username output * Add tooltip * Change Role Modify logic * Add Roles from database to existing users * Add default select Fillers * Indent JS * Add Change Role Related Translations * Remove unnecessary Whitespace and imports --- .../security/SecurityConfiguration.java | 42 +++++++++++++++++++ .../SPDF/config/security/UserService.java | 13 ++++++ .../SPDF/controller/api/UserController.java | 39 +++++++++++++++++ .../SPDF/repository/AuthorityRepository.java | 3 ++ src/main/resources/messages_ar_AR.properties | 3 ++ src/main/resources/messages_bg_BG.properties | 3 ++ src/main/resources/messages_ca_CA.properties | 3 ++ src/main/resources/messages_de_DE.properties | 3 ++ src/main/resources/messages_el_GR.properties | 3 ++ src/main/resources/messages_en_GB.properties | 3 ++ src/main/resources/messages_en_US.properties | 3 ++ src/main/resources/messages_es_ES.properties | 3 ++ src/main/resources/messages_eu_ES.properties | 3 ++ src/main/resources/messages_fr_FR.properties | 3 ++ src/main/resources/messages_hi_IN.properties | 3 ++ src/main/resources/messages_hu_HU.properties | 3 ++ src/main/resources/messages_id_ID.properties | 3 ++ src/main/resources/messages_it_IT.properties | 3 ++ src/main/resources/messages_ja_JP.properties | 3 ++ src/main/resources/messages_ko_KR.properties | 3 ++ src/main/resources/messages_nl_NL.properties | 3 ++ src/main/resources/messages_pl_PL.properties | 3 ++ src/main/resources/messages_pt_BR.properties | 3 ++ src/main/resources/messages_pt_PT.properties | 3 ++ src/main/resources/messages_ro_RO.properties | 3 ++ src/main/resources/messages_ru_RU.properties | 3 ++ .../resources/messages_sr_LATN_RS.properties | 3 ++ src/main/resources/messages_sv_SE.properties | 3 ++ src/main/resources/messages_tr_TR.properties | 3 ++ src/main/resources/messages_uk_UA.properties | 3 ++ src/main/resources/messages_zh_CN.properties | 3 ++ src/main/resources/messages_zh_TW.properties | 3 ++ src/main/resources/templates/addUsers.html | 32 ++++++++++++++ 33 files changed, 213 insertions(+) diff --git a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java index f61bb240..3c612bf8 100644 --- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java @@ -15,6 +15,9 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper; import org.springframework.security.core.session.SessionRegistry; import org.springframework.security.core.session.SessionRegistryImpl; import org.springframework.security.core.userdetails.UserDetailsService; @@ -23,6 +26,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository; import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.security.oauth2.core.user.OAuth2UserAuthority; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -34,9 +38,11 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio import jakarta.servlet.http.HttpSession; import stirling.software.SPDF.model.ApplicationProperties; +import stirling.software.SPDF.model.User; import stirling.software.SPDF.repository.JPATokenRepositoryImpl; import java.io.IOException; +import java.util.*; @Configuration @EnableWebSecurity() @@ -182,6 +188,10 @@ public class SecurityConfiguration { } } ) + // Add existing Authorities from the database + .userInfoEndpoint( userInfoEndpoint -> + userInfoEndpoint.userAuthoritiesMapper(userAuthoritiesMapper()) + ) ); } } else { @@ -210,6 +220,38 @@ public class SecurityConfiguration { .build(); } + /* + This following function is to grant Authorities to the OAUTH2 user from the values stored in the database. + This is required for the internal; 'hasRole()' function to give out the correct role. + */ + @Bean + @ConditionalOnProperty(value = "security.oauth2.enabled" , havingValue = "true", matchIfMissing = false) + GrantedAuthoritiesMapper userAuthoritiesMapper() { + return (authorities) -> { + Set mappedAuthorities = new HashSet<>(); + + authorities.forEach(authority -> { + // Add existing OAUTH2 Authorities + mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority())); + + // Add Authorities from database for existing user, if user is present. + if (authority instanceof OAuth2UserAuthority oauth2Auth) { + Optional userOpt = userService.findByUsernameIgnoreCase((String)oauth2Auth.getAttributes().get("email")); + if (userOpt.isPresent()) { + User user = userOpt.get(); + if (user != null){ + mappedAuthorities.add(new SimpleGrantedAuthority( + userService + .findRole(user) + .getAuthority())); + } + } + } + }); + return mappedAuthorities; + }; + } + @Bean public IPRateLimitingFilter rateLimitingFilter() { int maxRequestsPerIp = 1000000; // Example limit TODO add config level diff --git a/src/main/java/stirling/software/SPDF/config/security/UserService.java b/src/main/java/stirling/software/SPDF/config/security/UserService.java index 9fe5fdd1..f45db76a 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserService.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java @@ -21,6 +21,7 @@ import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface; import stirling.software.SPDF.model.Authority; import stirling.software.SPDF.model.Role; import stirling.software.SPDF.model.User; +import stirling.software.SPDF.repository.AuthorityRepository; import stirling.software.SPDF.repository.UserRepository; @Service @@ -28,6 +29,8 @@ public class UserService implements UserServiceInterface { @Autowired private UserRepository userRepository; + @Autowired private AuthorityRepository authorityRepository; + @Autowired private PasswordEncoder passwordEncoder; // Handle OAUTH2 login and user auto creation. @@ -202,6 +205,10 @@ public class UserService implements UserServiceInterface { return userRepository.findByUsernameIgnoreCase(username); } + public Authority findRole(User user) { + return authorityRepository.findByUserId(user.getId()); + } + public void changeUsername(User user, String newUsername) { user.setUsername(newUsername); userRepository.save(user); @@ -217,6 +224,12 @@ public class UserService implements UserServiceInterface { userRepository.save(user); } + public void changeRole(User user, String newRole) { + Authority userAuthority = this.findRole(user); + userAuthority.setAuthority(newRole); + authorityRepository.save(userAuthority); + } + public boolean isPasswordCorrect(User user, String currentPassword) { return passwordEncoder.matches(currentPassword, user.getPassword()); } diff --git a/src/main/java/stirling/software/SPDF/controller/api/UserController.java b/src/main/java/stirling/software/SPDF/controller/api/UserController.java index a7a40a0a..f5b7b159 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java @@ -227,6 +227,45 @@ public class UserController { return new RedirectView("/addUsers"); // Redirect to account page after adding the user } + @PreAuthorize("hasRole('ROLE_ADMIN')") + @PostMapping("/admin/changeRole") + public RedirectView changeRole( + @RequestParam(name = "username") String username, + @RequestParam(name = "role") String role, + Authentication authentication) { + + Optional userOpt = userService.findByUsernameIgnoreCase(username); + + if (!userOpt.isPresent()) { + return new RedirectView("/addUsers?messageType=userNotFound"); + } + if (!userService.usernameExistsIgnoreCase(username)) { + return new RedirectView("/addUsers?messageType=userNotFound"); + } + // Get the currently authenticated username + String currentUsername = authentication.getName(); + + // Check if the provided username matches the current session's username + if (currentUsername.equalsIgnoreCase(username)) { + return new RedirectView("/addUsers?messageType=downgradeCurrentUser"); + } + try { + // Validate the role + Role roleEnum = Role.fromString(role); + if (roleEnum == Role.INTERNAL_API_USER) { + // If the role is INTERNAL_API_USER, reject the request + return new RedirectView("/addUsers?messageType=invalidRole"); + } + } catch (IllegalArgumentException e) { + // If the role ID is not valid, redirect with an error message + return new RedirectView("/addUsers?messageType=invalidRole"); + } + User user = userOpt.get(); + + userService.changeRole(user, role); + return new RedirectView("/addUsers"); // Redirect to account page after adding the user + } + @PreAuthorize("hasRole('ROLE_ADMIN')") @PostMapping("/admin/deleteUser/{username}") public RedirectView deleteUser( diff --git a/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java b/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java index bbf32a07..5e14a326 100644 --- a/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java +++ b/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java @@ -9,4 +9,7 @@ import stirling.software.SPDF.model.Authority; public interface AuthorityRepository extends JpaRepository { // Set findByUsername(String username); Set findByUser_Username(String username); + + Authority findByUserId(long user_id); + } diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 89e681b5..c1102346 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=لا يمكن خفض دور المستخدم الحالي +downgradeCurrentUserLongMessage=لا يمكن تخفيض دور المستخدم الحالي. وبالتالي، لن يظهر المستخدم الحالي. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=تغيير دور المستخدم ############# # HOME-PAGE # diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 80b249cf..865522f6 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Новият потребител вече съществ invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител +downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане adminUserSettings.submit=Съхранете потребителя +adminUserSettings.changeUserRole=Промяна на ролята на потребителя ############# # HOME-PAGE # diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 823cbfff..c2e2e476 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=No es pot reduir la funció de l'usuari actual +downgradeCurrentUserLongMessage=No es pot baixar la funció de l'usuari actual. Per tant, no es mostrarà l'usuari actual. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Desar Usuari +adminUserSettings.changeUserRole=Canvia el rol de l'usuari ############# # HOME-PAGE # diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index a7c9bddf..a007f314 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Neuer Benutzername existiert bereits. invalidUsernameMessage=Ungültiger Benutzername. Der Benutzername darf nur Buchstaben und Zahlen enthalten. deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht werden. deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden. +downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden +downgradeCurrentUserLongMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden. Daher wird der aktuelle Benutzer nicht angezeigt. error=Fehler oops=Hoppla! help=Hilfe @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo-Benutzer (Keine benutzerdefinierten Einstellunge adminUserSettings.internalApiUser=Interner API-Benutzer adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei der Anmeldung zu ändern adminUserSettings.submit=Benutzer speichern +adminUserSettings.changeUserRole=Benutzerrolle ändern ############# # HOME-PAGE # diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 216982c3..08e5f329 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Το νέο όνομα χρήστη υπάρχει ήδη. invalidUsernameMessage=Μη έγκυρο όνομα χρήστη, το όνομα χρήστη πρέπει να περιέχει μόνο αλφαβητικούς χαρακτήρες και αριθμούς. deleteCurrentUserMessage=Δεν είναι δυνατή η διαγραφή του τρέχοντος συνδεδεμένου χρήστη. deleteUsernameExistsMessage=Το όνομα χρήστη δεν υπάρχει και δεν μπορεί να διαγραφεί. +downgradeCurrentUserMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη +downgradeCurrentUserLongMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη. Ως εκ τούτου, ο τρέχων χρήστης δεν θα εμφανίζεται. error=Σφάλμα oops=Ωχ! help=Βοήθεια @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo χρήστης (Χωρίς προσαρμοσμ adminUserSettings.internalApiUser=Εσωτερικός API χρήστης adminUserSettings.forceChange=Αναγκάστε τον χρήστη να αλλάξει το όνομα χρήστη/κωδικό πρόσβασης κατά τη σύνδεση adminUserSettings.submit=Αποθήκευση Χρήστη +adminUserSettings.changeUserRole=Αλλαγή ρόλου χρήστη ############# # HOME-PAGE # diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index 8117b6a3..ed3779cc 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Cannot downgrade current user's role +downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Change User's Role ############# # HOME-PAGE # diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 36c31264..df24e3a2 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Cannot downgrade current user's role +downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Change User's Role ############# # HOME-PAGE # diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 663d7b63..96008bed 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -57,6 +57,8 @@ usernameExistsMessage=El nuevo nombre de usuario está en uso. invalidUsernameMessage=Nombre de usuario no válido, El nombre de ususario debe contener únicamente números y caracteres alfabéticos. deleteCurrentUserMessage=No puede eliminar el usuario que tiene la sesión actualmente en uso. deleteUsernameExistsMessage=El usuario no existe y no puede eliminarse. +downgradeCurrentUserMessage=No se puede degradar el rol del usuario actual +downgradeCurrentUserLongMessage=No se puede degradar el rol del usuario actual. Por lo tanto, el usuario actual no se mostrará. error=Error oops=Ups! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Usuario Demo (Sin ajustes personalizados) adminUserSettings.internalApiUser=Usuario interno de API adminUserSettings.forceChange=Forzar usuario a cambiar usuario/contraseña en el acceso adminUserSettings.submit=Guardar Usuario +adminUserSettings.changeUserRole=Cambiar rol de usuario ############# # HOME-PAGE # diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 28a26fb8..5df9bc3d 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Ezin da uneko erabiltzailearen rola jaitsi +downgradeCurrentUserLongMessage=Ezin da uneko erabiltzailearen rola jaitsi. Beraz, oraingo erabiltzailea ez da erakutsiko. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Gorde Erabiltzailea +adminUserSettings.changeUserRole=Erabiltzailearen rola aldatu ############# # HOME-PAGE # diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 722158aa..6624b01c 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Le nouveau nom d’utilisateur existe déjà. invalidUsernameMessage=Nom d’utilisateur invalide, le nom d’utilisateur ne peut contenir que des chiffres et des lettres. deleteCurrentUserMessage=Impossible de supprimer l’utilisateur actuellement connecté. deleteUsernameExistsMessage=Le nom d’utilisateur n’existe pas et ne peut pas être supprimé. +downgradeCurrentUserMessage=Impossible de rétrograder le rôle de l'utilisateur actuel +downgradeCurrentUserLongMessage=Impossible de rétrograder le rôle de l'utilisateur actuel. Par conséquent, l'utilisateur actuel ne sera pas affiché. error=Erreur oops=Oups ! help=Aide @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (Paramètres par défaut) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Forcer l’utilisateur à changer son nom d’utilisateur/mot de passe lors de la connexion adminUserSettings.submit=Ajouter +adminUserSettings.changeUserRole=Changer le rôle de l'utilisateur ############# # HOME-PAGE # diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 316902f1..355ccb9e 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -57,6 +57,8 @@ usernameExistsMessage=नया उपयोगकर्ता नाम पह invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता +downgradeCurrentUserLongMessage=मौजूदा यूज़र की भूमिका को डाउनग्रेड नहीं किया जा सकता। इसलिए, वर्तमान उपयोगकर्ता को नहीं दिखाया जाएगा। error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=उपयोगकर्ता को लॉगिन पर उपयोगकर्ता नाम/पासवर्ड बदलने के लिए मजबूर करें adminUserSettings.submit=उपयोगकर्ता को सहेजें +adminUserSettings.changeUserRole=यूज़र की भूमिका बदलें ############# # HOME-PAGE # diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 957e2fe7..3b2811d4 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Az új felhasználónév már létezik. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=A jelenlegi felhasználó szerepkörét nem lehet visszaminősíteni +downgradeCurrentUserLongMessage=Az aktuális felhasználó szerepkörét nem lehet visszaminősíteni. Ezért az aktuális felhasználó nem jelenik meg. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Kényszerítse a felhasználót a felhasználónév/jelszó megváltoztatására bejelentkezéskor adminUserSettings.submit=Felhasználó mentése +adminUserSettings.changeUserRole=Felhasználó szerepkörének módosítása ############# # HOME-PAGE # diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index 476dd91a..370b01ad 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Nama pengguna baru sudah ada. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Tidak dapat menurunkan peran pengguna saat ini +downgradeCurrentUserLongMessage=Tidak dapat menurunkan peran pengguna saat ini. Oleh karena itu, pengguna saat ini tidak akan ditampilkan. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Memaksa pengguna untuk mengubah nama pengguna/kata sandi saat masuk adminUserSettings.submit=Simpan Pengguna +adminUserSettings.changeUserRole=Ubah Peran Pengguna ############# # HOME-PAGE # diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 346f402b..6f3ce31b 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Il nuovo nome utente esiste già. invalidUsernameMessage=Nome utente non valido, il nome utente deve contenere solo caratteri alfabetici e numeri. deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso. deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato. +downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente +downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato. error=Errore oops=Oops! help=Aiuto @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Utente demo (nessuna impostazione personalizzata) adminUserSettings.internalApiUser=API utente interna adminUserSettings.forceChange=Forza l'utente a cambiare nome username/password all'accesso adminUserSettings.submit=Salva utente +adminUserSettings.changeUserRole=Cambia il ruolo dell'utente ############# # HOME-PAGE # diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 4f142aa8..febd561c 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -57,6 +57,8 @@ usernameExistsMessage=新しいユーザー名はすでに存在します。 invalidUsernameMessage=ユーザー名が無効です。ユーザー名にはアルファベットと数字のみを使用してください。 deleteCurrentUserMessage=現在ログインしているユーザーは削除できません。 deleteUsernameExistsMessage=そのユーザー名は存在しないため削除できません。 +downgradeCurrentUserMessage=現在のユーザーの役割をダウングレードできません +downgradeCurrentUserLongMessage=現在のユーザーの役割をダウングレードできません。したがって、現在のユーザーは表示されません。 error=エラー oops=おっと！ help=ヘルプ @@ -173,6 +175,7 @@ adminUserSettings.demoUser=デモユーザー (カスタム設定なし) adminUserSettings.internalApiUser=内部APIユーザー adminUserSettings.forceChange=ログイン時にユーザー名/パスワードを強制的に変更する adminUserSettings.submit=ユーザーの保存 +adminUserSettings.changeUserRole=ユーザーの役割を変更する ############# # HOME-PAGE # diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 9f99ab10..e8604477 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=새 사용자명이 이미 존재합니다. invalidUsernameMessage=사용자 이름이 잘못되었습니다. 사용자 이름에는 알파벳 문자와 숫자만 포함되어야 합니다. deleteCurrentUserMessage=현재 로그인한 사용자를 삭제할 수 없습니다. deleteUsernameExistsMessage=사용자 이름이 존재하지 않으며 삭제할 수 없습니다. +downgradeCurrentUserMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다 +downgradeCurrentUserLongMessage=현재 사용자의 역할을 다운그레이드할 수 없습니다. 따라서 현재 사용자는 표시되지 않습니다. error=오류 oops=어머나! help=도움말 @@ -173,6 +175,7 @@ adminUserSettings.demoUser=데모 사용자(사용자 지정 설정 없음) adminUserSettings.internalApiUser=내부 API 사용자 adminUserSettings.forceChange=다음 로그인 때 사용자명과 비밀번호를 변경하도록 강제 adminUserSettings.submit=사용자 저장 +adminUserSettings.changeUserRole=사용자의 역할 변경 ############# # HOME-PAGE # diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index a82f1c2c..6ba6a7b3 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Nieuwe gebruikersnaam bestaat al. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Kan de rol van de huidige gebruiker niet downgraden +downgradeCurrentUserLongMessage=Kan de rol van de huidige gebruiker niet downgraden. Huidige gebruiker wordt dus niet weergegeven. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demogebruiker (geen aangepaste instellingen) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Forceer gebruiker om gebruikersnaam/wachtwoord te wijzigen bij inloggen adminUserSettings.submit=Gebruiker opslaan +adminUserSettings.changeUserRole=De rol van de gebruiker wijzigen ############# # HOME-PAGE # diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 4f8b5470..ee96d34f 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Nie można obniżyć roli bieżącego użytkownika +downgradeCurrentUserLongMessage=Nie można obniżyć roli bieżącego użytkownika. W związku z tym bieżący użytkownik nie zostanie wyświetlony. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Zmień rolę użytkownika ############# # HOME-PAGE # diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index c6dc2215..715615e4 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Não é possível fazer downgrade da função do usuário atual +downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do usuário atual. Portanto, o usuário atual não será mostrado. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Alterar Função de Usuário ############# # HOME-PAGE # diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index ecbeba35..7a5541e2 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Esse utilizador já existe. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Não é possível fazer downgrade da função do utilizador atual +downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do utilizador atual. Portanto, o utilizador atual não será mostrado. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Alterar usuário ############# # HOME-PAGE # diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 573cce94..55f5e3d9 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Rolul utilizatorului curent nu poate fi retrogradat +downgradeCurrentUserLongMessage=Rolul utilizatorului curent nu poate fi retrogradat. Prin urmare, utilizatorul curent nu va fi afișat. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Schimbați rolul utilizatorului ############# # HOME-PAGE # diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 9a4c3428..fc7f3965 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Новое имя пользователя уже суще invalidUsernameMessage=Недопустимое имя пользователя, Имя пользователя должно содержать только буквы алфавита и цифры. deleteCurrentUserMessage=Невозможно удалить пользователя, вошедшего в систему. deleteUsernameExistsMessage=Имя пользователя не существует и не может быть удалено. +downgradeCurrentUserMessage=Невозможно понизить роль текущего пользователя +downgradeCurrentUserLongMessage=Невозможно понизить роль текущего пользователя. Следовательно, текущий пользователь не будет отображаться. error=Ошибка oops=Ой! help=Помощь @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Демо-пользователь (без настр adminUserSettings.internalApiUser=Внутренний пользователь API adminUserSettings.forceChange=Просить пользователя изменить пароль при входе в систему adminUserSettings.submit=Сохранить пользователя +adminUserSettings.changeUserRole=Изменить роль пользователя ############# # HOME-PAGE # diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index cf2613b0..07c32db3 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Novi korisnik već postoji invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Nije moguće degradirati ulogu trenutnog korisnika +downgradeCurrentUserLongMessage=Nije moguće unazaditi ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo korisnik (Bez prilagođenih podešavanja) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Prisili korisnika da promeni korisničko ime/lozinku pri prijavi adminUserSettings.submit=Sačuvaj korisnika +adminUserSettings.changeUserRole=Promenite ulogu korisnika ############# # HOME-PAGE # diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index 26ef9ecb..ac29f553 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -57,6 +57,8 @@ usernameExistsMessage=New Username already exists. invalidUsernameMessage=Invalid username, Username must only contain alphabet characters and numbers. deleteCurrentUserMessage=Cannot delete currently logged in user. deleteUsernameExistsMessage=The username does not exist and cannot be deleted. +downgradeCurrentUserMessage=Kan inte nedgradera nuvarande användares roll +downgradeCurrentUserLongMessage=Kan inte nedgradera nuvarande användares roll. Därför kommer den aktuella användaren inte att visas. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo User (No custom settings) adminUserSettings.internalApiUser=Internal API User adminUserSettings.forceChange=Force user to change password on login adminUserSettings.submit=Save User +adminUserSettings.changeUserRole=Ändra användarens roll ############# # HOME-PAGE # diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index d5e02c13..c8d3bab6 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Yeni Kullanıcı Adı zaten var. invalidUsernameMessage=Geçersiz kullanıcı adı, Kullanıcı adı yalnızca alfabe karakterleri ve sayılar içermelidir. deleteCurrentUserMessage=Şu anda oturum açmış olan kullanıcı silinemiyor. deleteUsernameExistsMessage=Kullanıcı adı mevcut değil ve silinemez. +downgradeCurrentUserMessage=Mevcut kullanıcının rolü düşürülemiyor +downgradeCurrentUserLongMessage=Mevcut kullanıcının rolü düşürülemiyor. Bu nedenle, mevcut kullanıcı gösterilmeyecektir. error=Hata oops=Tüh! help=Yardım @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Demo Kullanıcısı (Özel ayar yok) adminUserSettings.internalApiUser=Dahili API Kullanıcısı adminUserSettings.forceChange=Kullanıcının girişte kullanıcı adı/şifre değiştirmesini zorla adminUserSettings.submit=Kullanıcıyı Kaydet +adminUserSettings.changeUserRole=Kullanıcı rolünü değiştir ############# # HOME-PAGE # diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index d5800ebc..6cd0ace0 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -57,6 +57,8 @@ usernameExistsMessage=Нове ім'я користувача вже існує. invalidUsernameMessage=Недійсне ім'я користувача, Ім'я користувача повинно містити тільки літери алфавіту та цифри. deleteCurrentUserMessage=Неможливо видалити користувача, який увійшов в систему. deleteUsernameExistsMessage=Ім'я користувача не існує і не може бути видалено. +downgradeCurrentUserMessage=Неможливо понизити роль поточного користувача +downgradeCurrentUserLongMessage=Неможливо понизити роль поточного користувача. Отже, поточний користувач не відображатиметься. error=Error oops=Oops! help=Help @@ -173,6 +175,7 @@ adminUserSettings.demoUser=Демо-користувач (без налашто adminUserSettings.internalApiUser=Внутрішній користувач API adminUserSettings.forceChange=Примусити користувача змінити пароль при вході в систему adminUserSettings.submit=Зберегти користувача +adminUserSettings.changeUserRole=Змінити роль користувача ############# # HOME-PAGE # diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index aefc95da..7ea7ed55 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -57,6 +57,8 @@ usernameExistsMessage=新用户名已存在。 invalidUsernameMessage=用户名无效，用户名只能由字母字符和数字组成。 deleteCurrentUserMessage=无法删除当前登录的用户。 deleteUsernameExistsMessage=用户名不存在，无法删除。 +downgradeCurrentUserMessage=无法降级当前用户的角色 +downgradeCurrentUserLongMessage=无法降级当前用户的角色。因此，当前用户将不会显示。 error=错误 oops=哎呀！ help=帮助 @@ -173,6 +175,7 @@ adminUserSettings.demoUser=演示用户(无自定义设置) adminUserSettings.internalApiUser=内部API用户 adminUserSettings.forceChange=强制用户在登录时更改用户名/密码 adminUserSettings.submit=保存用户 +adminUserSettings.changeUserRole=更改用户角色 ############# # HOME-PAGE # diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 54a73109..2c089b13 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -57,6 +57,8 @@ usernameExistsMessage=新使用者名稱已存在。 invalidUsernameMessage=使用者名無效，使用者名只能包含字母字元和數位。 deleteCurrentUserMessage=無法刪除目前登錄的使用者。 deleteUsernameExistsMessage=使用者名不存在，無法刪除。 +downgradeCurrentUserMessage=無法降級目前使用者的角色 +downgradeCurrentUserLongMessage=無法降級目前使用者的角色。因此，不會顯示目前的使用者。 error=錯誤 oops=哎呀！ help=幫助 @@ -173,6 +175,7 @@ adminUserSettings.demoUser=示範用途的使用者（無自訂設定） adminUserSettings.internalApiUser=內部 API 使用者 adminUserSettings.forceChange=強制使用者在登入時修改使用者名稱/密碼 adminUserSettings.submit=儲存 +adminUserSettings.changeUserRole=更改使用者身份 ############# # HOME-PAGE # diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html index 850beb9e..d5fb14ee 100644 --- a/src/main/resources/templates/addUsers.html +++ b/src/main/resources/templates/addUsers.html @@ -58,6 +58,7 @@
      @@ -66,6 +67,32 @@
      + + + +
      +

      Change User's Role

      + +
      + Username not found + Cannot downgrade current user's role +
      +
      +
      + + +
      +
      + + +
      +
      @@ -73,6 +100,11 @@
      +
      From 7f577a6052b5b1106892efd4b17543fae8aec345 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 22:02:33 +0100 Subject: [PATCH 184/200] :memo: Update README: Translation Progress Table (#1155) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db9ed2d4..aadb15c7 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ Stirling PDF currently supports 27! | Polish (Polski) (pl_PL) | ![44%](https://geps.dev/progress/44) | | Romanian (Română) (ro_RO) | ![41%](https://geps.dev/progress/41) | | Korean (한국어) (ko_KR) | ![91%](https://geps.dev/progress/91) | -| Portuguese Brazilian (Português) (pt_BR) | ![63%](https://geps.dev/progress/63) | +| Portuguese Brazilian (Português) (pt_BR) | ![64%](https://geps.dev/progress/64) | | Russian (Русский) (ru_RU) | ![91%](https://geps.dev/progress/91) | | Basque (Euskara) (eu_ES) | ![66%](https://geps.dev/progress/66) | | Japanese (日本語) (ja_JP) | ![91%](https://geps.dev/progress/91) | From 4372536c1702c07833a3a1d580719a4e53bcfaca Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 3 May 2024 10:40:22 +0100 Subject: [PATCH 185/200] Remove ChatGPT mention to avoid confusion --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aadb15c7..e47b0bde 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af) -This is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. Originally developed entirely by ChatGPT, this locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements. +This is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements. Stirling PDF does not initiate any outbound calls for record-keeping or tracking purposes. From fbbc71d7e6a3fe81fb1dbcdca3556a18d1a21798 Mon Sep 17 00:00:00 2001 From: t71rs <166131967+t71rs@users.noreply.github.com> Date: Fri, 3 May 2024 20:09:36 +0200 Subject: [PATCH 186/200] Drag&drop bug (#1157) * Fixed issue that Drag and Droppped Files can not be deleted * Deleted unnecessary Comment --- src/main/resources/static/js/fileInput.js | 5 +++++ src/main/resources/static/js/merge.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/resources/static/js/fileInput.js b/src/main/resources/static/js/fileInput.js index 89ad1ad9..001c8f24 100644 --- a/src/main/resources/static/js/fileInput.js +++ b/src/main/resources/static/js/fileInput.js @@ -104,4 +104,9 @@ function setupFileInput(chooser) { $(inputElement).siblings(".custom-file-label").addClass("selected").html(pdfPrompt); } } + //Listen for event of file being removed and the filter it out of the allFiles array + document.addEventListener("fileRemoved", function (e) { + const fileName = e.detail; + allFiles = allFiles.filter(file => file.name !== fileName); + }); } diff --git a/src/main/resources/static/js/merge.js b/src/main/resources/static/js/merge.js index 4936fa6b..55575727 100644 --- a/src/main/resources/static/js/merge.js +++ b/src/main/resources/static/js/merge.js @@ -69,8 +69,13 @@ function attachMoveButtons() { removeButtons[i].addEventListener("click", function (event) { event.preventDefault(); var parent = this.closest(".list-group-item"); + //Get name of removed file + var fileName = parent.querySelector(".filename").innerText; parent.remove(); updateFiles(); + //Dispatch a custom event with the name of the removed file + var event = new CustomEvent("fileRemoved", { detail: fileName }); + document.dispatchEvent(event); }); } } From 890163053b554484362f443f4d9ab72aa65e0556 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 3 May 2024 20:43:48 +0100 Subject: [PATCH 187/200] introduces custom settings file (#1158) * Introducing a custom settings file * formats * chnages * Update README.md --- README.md | 2 + .../software/SPDF/SPdfApplication.java | 30 +- .../SPDF/config/ConfigInitializer.java | 272 ++++++++---------- .../config/FileFallbackTemplateResolver.java | 2 +- .../security/CustomLogoutSuccessHandler.java | 34 +-- .../config/security/InitialSecuritySetup.java | 14 +- .../security/SecurityConfiguration.java | 155 +++++----- .../SPDF/config/security/UserService.java | 2 +- .../converters/ConvertImgPDFController.java | 2 +- .../controller/web/AccountWebController.java | 4 +- .../SPDF/model/ApplicationProperties.java | 2 +- .../SPDF/repository/AuthorityRepository.java | 1 - src/main/resources/settings.yml.template | 5 +- 13 files changed, 272 insertions(+), 253 deletions(-) diff --git a/README.md b/README.md index e47b0bde..82f0dcb7 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,8 @@ metrics: enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable ``` +There is an additional config file ``/configs/custom_settings.yml`` were users familiar with java and spring application.properties can input their own settings on-top of Stirling-PDFs existing ones + ### Extra notes - Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md) diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java index e21dadb1..fb682998 100644 --- a/src/main/java/stirling/software/SPDF/SPdfApplication.java +++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java @@ -5,6 +5,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,14 +67,36 @@ public class SPdfApplication { SpringApplication app = new SpringApplication(SPdfApplication.class); app.addInitializers(new ConfigInitializer()); + Map propertyFiles = new HashMap<>(); + + // stirling pdf settings file if (Files.exists(Paths.get("configs/settings.yml"))) { - app.setDefaultProperties( - Collections.singletonMap( - "spring.config.additional-location", "file:configs/settings.yml")); + propertyFiles.put("spring.config.additional-location", "file:configs/settings.yml"); } else { logger.warn( "External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead."); } + + // custom javs settings file + if (Files.exists(Paths.get("configs/custom_settings.yml"))) { + String existing = propertyFiles.getOrDefault("spring.config.additional-location", ""); + if (!existing.isEmpty()) { + existing += ","; + } + propertyFiles.put( + "spring.config.additional-location", + existing + "file:configs/custom_settings.yml"); + } else { + logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist."); + } + + if (!propertyFiles.isEmpty()) { + app.setDefaultProperties( + Collections.singletonMap( + "spring.config.additional-location", + propertyFiles.get("spring.config.additional-location"))); + } + app.run(args); try { diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java index 7bceaf8f..177a91ad 100644 --- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java +++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java @@ -1,20 +1,20 @@ package stirling.software.SPDF.config; -import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; +import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; -import java.util.Optional; +import java.util.Map; import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -26,12 +26,12 @@ public class ConfigInitializer public void initialize(ConfigurableApplicationContext applicationContext) { try { ensureConfigExists(); - } catch (IOException e) { + } catch (Exception e) { throw new RuntimeException("Failed to initialize application configuration", e); } } - public void ensureConfigExists() throws IOException { + public void ensureConfigExists() throws IOException, URISyntaxException { // Define the path to the external config directory Path destPath = Paths.get("configs", "settings.yml"); @@ -51,170 +51,132 @@ public class ConfigInitializer } } } else { - // If user file exists, we need to merge it with the template from the classpath - List templateLines; - try (InputStream in = - getClass().getClassLoader().getResourceAsStream("settings.yml.template")) { - templateLines = - new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)) - .lines() - .collect(Collectors.toList()); - } + Path templatePath = + Paths.get( + getClass() + .getClassLoader() + .getResource("settings.yml.template") + .toURI()); + Path userPath = Paths.get("configs", "settings.yml"); - mergeYamlFiles(templateLines, destPath, destPath); + List templateLines = Files.readAllLines(templatePath); + List userLines = + Files.exists(userPath) ? Files.readAllLines(userPath) : new ArrayList<>(); + + Map templateEntries = extractEntries(templateLines); + Map userEntries = extractEntries(userLines); + + List mergedLines = mergeConfigs(templateLines, templateEntries, userEntries); + mergedLines = cleanInvalidYamlEntries(mergedLines); + Files.write(userPath, mergedLines); + } + + Path customSettingsPath = Paths.get("configs", "custom_settings.yml"); + if (!Files.exists(customSettingsPath)) { + Files.createFile(customSettingsPath); } } - public void mergeYamlFiles(List templateLines, Path userFilePath, Path outputPath) - throws IOException { - List userLines = Files.readAllLines(userFilePath); + private static Map extractEntries(List lines) { + Map entries = new HashMap<>(); + String keyRegex = "^\\s*(\\w+)\\s*:\\s*(.*)"; // Capture key and value + Pattern pattern = Pattern.compile(keyRegex); + + for (String line : lines) { + Matcher matcher = pattern.matcher(line); + if (matcher.find() && !line.trim().startsWith("#")) { + String key = matcher.group(1).trim(); + String value = matcher.group(2).trim(); // Capture the value directly + entries.put(key, line); + } + } + return entries; + } + + + private static List mergeConfigs( + List templateLines, + Map templateEntries, + Map userEntries) { List mergedLines = new ArrayList<>(); - boolean insideAutoGenerated = false; - boolean beforeFirstKey = true; - - Function isCommented = line -> line.trim().startsWith("#"); - Function extractKey = - line -> { - String[] parts = line.split(":"); - return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : ""; - }; - - Function getIndentationLevel = - line -> { - int count = 0; - for (char ch : line.toCharArray()) { - if (ch == ' ') count++; - else break; - } - return count; - }; - - Set userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet()); + Set handledKeys = new HashSet<>(); for (String line : templateLines) { - String key = extractKey.apply(line); - - if ("AutomaticallyGenerated:".equalsIgnoreCase(line.trim())) { - insideAutoGenerated = true; - mergedLines.add(line); - continue; - } else if (insideAutoGenerated && line.trim().isEmpty()) { - insideAutoGenerated = false; - mergedLines.add(line); - continue; - } - - if (beforeFirstKey && (isCommented.apply(line) || line.trim().isEmpty())) { - // Handle top comments and empty lines before the first key. - mergedLines.add(line); - continue; - } - - if (!key.isEmpty()) beforeFirstKey = false; - - if (userKeys.contains(key)) { - // If user has any version (commented or uncommented) of this key, skip the - // template line - Optional userValue = - userLines.stream() - .filter( - l -> - extractKey.apply(l).equalsIgnoreCase(key) - && !isCommented.apply(l)) - .findFirst(); - if (userValue.isPresent()) mergedLines.add(userValue.get()); - continue; - } - - if (isCommented.apply(line) || line.trim().isEmpty() || !userKeys.contains(key)) { - mergedLines.add( - line); // If line is commented, empty or key not present in user's file, - // retain the - // template line - continue; - } - } - - // Add any additional uncommented user lines that are not present in the - // template - for (String userLine : userLines) { - String userKey = extractKey.apply(userLine); - boolean isPresentInTemplate = - templateLines.stream() - .map(extractKey) - .anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey)); - if (!isPresentInTemplate && !isCommented.apply(userLine)) { - if (!childOfTemplateEntry( - isCommented, - extractKey, - getIndentationLevel, - userLines, - userLine, - templateLines)) { - // check if userLine is a child of a entry within templateLines or not, if child - // of parent in templateLines then dont add to mergedLines, if anything else - // then add - mergedLines.add(userLine); + String cleanLine = line.split("#")[0].trim(); + if (!cleanLine.isEmpty() && cleanLine.contains(":")) { + String key = cleanLine.split(":")[0].trim(); + if (userEntries.containsKey(key)) { + // Always use user's entry if exists + mergedLines.add(userEntries.get(key)); + handledKeys.add(key); + } else { + // Use template's entry if no user entry + mergedLines.add(line); } + } else { + // Add comments and other lines directly + mergedLines.add(line); } } - Files.write(outputPath, mergedLines, StandardCharsets.UTF_8); + // Add user entries not present in the template at the end + for (String key : userEntries.keySet()) { + if (!handledKeys.contains(key)) { + mergedLines.add(userEntries.get(key)); + } + } + + return mergedLines; } - // New method to check if a userLine is a child of an entry in templateLines - boolean childOfTemplateEntry( - Function isCommented, - Function extractKey, - Function getIndentationLevel, - List userLines, - String userLine, - List templateLines) { - String userKey = extractKey.apply(userLine).trim(); - int userIndentation = getIndentationLevel.apply(userLine); - // Start by assuming the line is not a child of an entry in templateLines - boolean isChild = false; + private static List cleanInvalidYamlEntries(List lines) { + List cleanedLines = new ArrayList<>(); + for (int i = 0; i < lines.size(); i++) { + String line = lines.get(i); + String trimmedLine = line.trim(); - // Iterate backwards through userLines from the current line to find any parent - for (int i = userLines.indexOf(userLine) - 1; i >= 0; i--) { - String potentialParentLine = userLines.get(i); - int parentIndentation = getIndentationLevel.apply(potentialParentLine); - - // Check if we've reached a potential parent based on indentation - if (parentIndentation < userIndentation) { - String parentKey = extractKey.apply(potentialParentLine).trim(); - - // Now, check if this potential parent or any of its parents exist in templateLines - boolean parentExistsInTemplate = - templateLines.stream() - .filter(line -> !isCommented.apply(line)) // Skip commented lines - .anyMatch( - templateLine -> { - String templateKey = - extractKey.apply(templateLine).trim(); - return parentKey.equalsIgnoreCase(templateKey); - }); - - if (!parentExistsInTemplate) { - // If the parent does not exist in template, check the next level parent - userIndentation = - parentIndentation; // Update userIndentation to the parent's indentation - // for next iteration - if (parentIndentation == 0) { - // If we've reached the top-level parent and it's not in template, the - // original line is considered not a child - isChild = false; - break; - } - } else { - // If any parent exists in template, the original line is considered a child - isChild = true; - break; - } + // Ignore commented lines and lines that don't look like key-only entries + if (trimmedLine.startsWith("#") + || !trimmedLine.endsWith(":") + || trimmedLine.contains(" ")) { + cleanedLines.add(line); + continue; } + + // For potential key-only lines, check the next line to determine context + if (isKeyWithoutChildrenOrValue(i, lines)) { + // Skip adding the current line since it's a key without any following value or + // children + continue; + } + + cleanedLines.add(line); + } + return cleanedLines; + } + + private static boolean isKeyWithoutChildrenOrValue(int currentIndex, List lines) { + if (currentIndex + 1 < lines.size()) { + String currentLine = lines.get(currentIndex); + String nextLine = lines.get(currentIndex + 1); + int currentIndentation = getIndentationLevel(currentLine); + int nextIndentation = getIndentationLevel(nextLine); + + // If the next line is less or equally indented, it's not a child or value + return nextIndentation <= currentIndentation; } - return isChild; // Return true if the line is not a child of any entry in templateLines + // If it's the last line, then it definitely has no children or value + return true; + } + + private static int getIndentationLevel(String line) { + int count = 0; + for (char ch : line.toCharArray()) { + if (ch == ' ') count++; + else break; + } + return count; } } diff --git a/src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java b/src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java index 10ea9488..be6e28a7 100644 --- a/src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java +++ b/src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java @@ -37,7 +37,7 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe return new FileTemplateResource(resource.getFile().getPath(), characterEncoding); } } catch (IOException e) { - + } return new ClassLoaderTemplateResource( diff --git a/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java b/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java index 8926814e..300eee00 100644 --- a/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java +++ b/src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java @@ -2,42 +2,38 @@ package stirling.software.SPDF.config.security; import java.io.IOException; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.ServletException; import org.springframework.context.annotation.Bean; import org.springframework.security.core.Authentication; import org.springframework.security.core.session.SessionRegistry; import org.springframework.security.core.session.SessionRegistryImpl; import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler; -public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler -{ +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { @Bean public SessionRegistry sessionRegistry() { return new SessionRegistryImpl(); } @Override - public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException - { + public void onLogoutSuccess( + HttpServletRequest request, HttpServletResponse response, Authentication authentication) + throws IOException, ServletException { HttpSession session = request.getSession(false); if (session != null) { String sessionId = session.getId(); - sessionRegistry() - .removeSessionInformation( - sessionId); + sessionRegistry().removeSessionInformation(sessionId); } - if(request.getParameter("oauth2AutoCreateDisabled") != null) - { - response.sendRedirect(request.getContextPath()+"/login?error=oauth2AutoCreateDisabled"); - } - else - { + if (request.getParameter("oauth2AutoCreateDisabled") != null) { + response.sendRedirect( + request.getContextPath() + "/login?error=oauth2AutoCreateDisabled"); + } else { response.sendRedirect(request.getContextPath() + "/login?logout=true"); } } -} \ No newline at end of file +} diff --git a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java index 0d87ca48..b472622b 100644 --- a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java +++ b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java @@ -50,7 +50,7 @@ public class InitialSecuritySetup { @PostConstruct public void initSecretKey() throws IOException { String secretKey = applicationProperties.getAutomaticallyGenerated().getKey(); - if (secretKey == null || secretKey.isEmpty()) { + if (!isValidUUID(secretKey)) { secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key saveKeyToConfig(secretKey); } @@ -85,4 +85,16 @@ public class InitialSecuritySetup { // Write back to the file Files.write(path, lines); } + private boolean isValidUUID(String uuid) { + if (uuid == null) { + return false; + } + try { + UUID.fromString(uuid); + return true; + } catch (IllegalArgumentException e) { + return false; + } + } + } diff --git a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java index 3c612bf8..8eb80cdc 100644 --- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java @@ -1,8 +1,8 @@ package stirling.software.SPDF.config.security; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -24,6 +24,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.security.oauth2.client.registration.ClientRegistrations; import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.security.oauth2.core.user.OAuth2UserAuthority; @@ -33,17 +35,15 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; import org.springframework.security.web.savedrequest.NullRequestCache; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import org.springframework.security.oauth2.client.registration.ClientRegistrations; -import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import stirling.software.SPDF.model.ApplicationProperties; import stirling.software.SPDF.model.User; import stirling.software.SPDF.repository.JPATokenRepositoryImpl; -import java.io.IOException; -import java.util.*; - @Configuration @EnableWebSecurity() @EnableMethodSecurity @@ -109,7 +109,7 @@ public class SecurityConfiguration { logout -> logout.logoutRequestMatcher( new AntPathRequestMatcher("/logout")) - .logoutSuccessHandler(new CustomLogoutSuccessHandler()) // Use a Custom Logout Handler to handle custom error message if OAUTH2 Auto Create is disabled + .logoutSuccessHandler(new CustomLogoutSuccessHandler()) .invalidateHttpSession(true) // Invalidate session .deleteCookies("JSESSIONID", "remember-me") .addLogoutHandler( @@ -167,33 +167,45 @@ public class SecurityConfiguration { // Handle OAUTH2 Logins if (applicationProperties.getSecurity().getOAUTH2().getEnabled()) { - http.oauth2Login( oauth2 -> oauth2 - .loginPage("/oauth2") - /* - This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database. - If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser' - is set as true, else login fails with an error message advising the same. - */ - .successHandler(new AuthenticationSuccessHandler() { - @Override - public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, - Authentication authentication) throws ServletException , IOException{ - OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal(); - if (userService.processOAuth2PostLogin(oauthUser.getAttribute("email"), applicationProperties.getSecurity().getOAUTH2().getAutoCreateUser())) { - response.sendRedirect("/"); - } - else{ - response.sendRedirect("/logout?oauth2AutoCreateDisabled=true"); - } - } - } - ) - // Add existing Authorities from the database - .userInfoEndpoint( userInfoEndpoint -> - userInfoEndpoint.userAuthoritiesMapper(userAuthoritiesMapper()) - ) - ); - } + http.oauth2Login( + oauth2 -> + oauth2.loginPage("/oauth2") + /* + This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database. + If user exists, login proceeds as usual. If user does not exist, then it is autocreated but only if 'OAUTH2AutoCreateUser' + is set as true, else login fails with an error message advising the same. + */ + .successHandler( + new AuthenticationSuccessHandler() { + @Override + public void onAuthenticationSuccess( + HttpServletRequest request, + HttpServletResponse response, + Authentication authentication) + throws ServletException, IOException { + OAuth2User oauthUser = + (OAuth2User) + authentication + .getPrincipal(); + if (userService.processOAuth2PostLogin( + oauthUser.getAttribute("email"), + applicationProperties + .getSecurity() + .getOAUTH2() + .getAutoCreateUser())) { + response.sendRedirect("/"); + } else { + response.sendRedirect( + "/logout?oauth2AutoCreateDisabled=true"); + } + } + }) + // Add existing Authorities from the database + .userInfoEndpoint( + userInfoEndpoint -> + userInfoEndpoint.userAuthoritiesMapper( + userAuthoritiesMapper()))); + } } else { http.csrf(csrf -> csrf.disable()) .authorizeHttpRequests(authz -> authz.anyRequest().permitAll()); @@ -204,50 +216,59 @@ public class SecurityConfiguration { // Client Registration Repository for OAUTH2 OIDC Login @Bean - @ConditionalOnProperty(value = "security.oauth2.enabled" , havingValue = "true", matchIfMissing = false) - public ClientRegistrationRepository clientRegistrationRepository() { - return new InMemoryClientRegistrationRepository(this.oidcClientRegistration()); - } + @ConditionalOnProperty( + value = "security.oauth2.enabled", + havingValue = "true", + matchIfMissing = false) + public ClientRegistrationRepository clientRegistrationRepository() { + return new InMemoryClientRegistrationRepository(this.oidcClientRegistration()); + } - private ClientRegistration oidcClientRegistration() { - return ClientRegistrations.fromOidcIssuerLocation(applicationProperties.getSecurity().getOAUTH2().getIssuer()) - .registrationId("oidc") - .clientId(applicationProperties.getSecurity().getOAUTH2().getClientId()) - .clientSecret(applicationProperties.getSecurity().getOAUTH2().getClientSecret()) - .scope("openid", "profile", "email") - .userNameAttributeName("email") - .clientName("OIDC") - .build(); - } + private ClientRegistration oidcClientRegistration() { + return ClientRegistrations.fromOidcIssuerLocation( + applicationProperties.getSecurity().getOAUTH2().getIssuer()) + .registrationId("oidc") + .clientId(applicationProperties.getSecurity().getOAUTH2().getClientId()) + .clientSecret(applicationProperties.getSecurity().getOAUTH2().getClientSecret()) + .scope("openid", "profile", "email") + .userNameAttributeName("email") + .clientName("OIDC") + .build(); + } /* This following function is to grant Authorities to the OAUTH2 user from the values stored in the database. This is required for the internal; 'hasRole()' function to give out the correct role. */ @Bean - @ConditionalOnProperty(value = "security.oauth2.enabled" , havingValue = "true", matchIfMissing = false) + @ConditionalOnProperty( + value = "security.oauth2.enabled", + havingValue = "true", + matchIfMissing = false) GrantedAuthoritiesMapper userAuthoritiesMapper() { return (authorities) -> { Set mappedAuthorities = new HashSet<>(); - authorities.forEach(authority -> { - // Add existing OAUTH2 Authorities - mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority())); + authorities.forEach( + authority -> { + // Add existing OAUTH2 Authorities + mappedAuthorities.add(new SimpleGrantedAuthority(authority.getAuthority())); - // Add Authorities from database for existing user, if user is present. - if (authority instanceof OAuth2UserAuthority oauth2Auth) { - Optional userOpt = userService.findByUsernameIgnoreCase((String)oauth2Auth.getAttributes().get("email")); - if (userOpt.isPresent()) { - User user = userOpt.get(); - if (user != null){ - mappedAuthorities.add(new SimpleGrantedAuthority( - userService - .findRole(user) - .getAuthority())); + // Add Authorities from database for existing user, if user is present. + if (authority instanceof OAuth2UserAuthority oauth2Auth) { + Optional userOpt = + userService.findByUsernameIgnoreCase( + (String) oauth2Auth.getAttributes().get("email")); + if (userOpt.isPresent()) { + User user = userOpt.get(); + if (user != null) { + mappedAuthorities.add( + new SimpleGrantedAuthority( + userService.findRole(user).getAuthority())); + } + } } - } - } - }); + }); return mappedAuthorities; }; } diff --git a/src/main/java/stirling/software/SPDF/config/security/UserService.java b/src/main/java/stirling/software/SPDF/config/security/UserService.java index f45db76a..7d57f8f6 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserService.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java @@ -44,7 +44,7 @@ public class UserService implements UserServiceInterface { user.setUsername(username); user.setEnabled(true); user.setFirstLogin(false); - user.addAuthority(new Authority( Role.USER.getRoleId(), user)); + user.addAuthority(new Authority(Role.USER.getRoleId(), user)); userRepository.save(user); return true; } diff --git a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java index eeb4db08..9fa357f7 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java @@ -74,7 +74,7 @@ public class ConvertImgPDFController { } if (singleImage) { - String docName = filename + "." + imageFormat; + String docName = filename + "." + imageFormat; MediaType mediaType = MediaType.parseMediaType(getMediaType(imageFormat)); return WebResponseUtils.bytesToWebResponse(result, docName, mediaType); } else { diff --git a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java index 03ba2020..bc43bd4b 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; @@ -39,7 +38,8 @@ public class AccountWebController { return "redirect:/"; } - model.addAttribute("oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled()); + model.addAttribute( + "oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled()); model.addAttribute("currentPage", "login"); diff --git a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java index 72de4094..ce109299 100644 --- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java +++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java @@ -271,7 +271,7 @@ public class ApplicationProperties { + ", clientId=" + clientId + ", clientSecret=" - + (clientSecret!= null && !clientSecret.isEmpty() ? "MASKED" : "NULL") + + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL") + ", autoCreateUser=" + autoCreateUser + "]"; diff --git a/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java b/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java index 5e14a326..41c251e1 100644 --- a/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java +++ b/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java @@ -11,5 +11,4 @@ public interface AuthorityRepository extends JpaRepository { Set findByUser_Username(String username); Authority findByUserId(long user_id); - } diff --git a/src/main/resources/settings.yml.template b/src/main/resources/settings.yml.template index f6a68b5f..7d2047c3 100644 --- a/src/main/resources/settings.yml.template +++ b/src/main/resources/settings.yml.template @@ -20,7 +20,6 @@ system: enableAlphaFunctionality: false # Set to enable functionality which might need more testing before it fully goes live (This feature might make no changes) showUpdate: true # see when a new update is available showUpdateOnlyAdmin: false # Only admins can see when a new update is available, depending on showUpdate it must be set to 'true' - customHTMLFiles: false # Enable to have files placed in /customFiles/templates override the existing template html files #ui: # appName: exampleAppName # Application's visible name @@ -33,3 +32,7 @@ endpoints: metrics: enabled: true # 'true' to enable Info APIs (`/api/*`) endpoints, 'false' to disable + +# Automatically Generated Settings (Do Not Edit Directly) +AutomaticallyGenerated: + key: example \ No newline at end of file From 38979dd362de26532a3fbcdab2215a19ec0173dc Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 3 May 2024 22:23:21 +0100 Subject: [PATCH 188/200] lets try this again (Config fix) (#1159) * Introducing a custom settings file * formats * chnages * Update README.md * fixes --------- Co-authored-by: a --- .../SPDF/config/ConfigInitializer.java | 94 +++++++++++-------- src/main/resources/settings.yml.template | 8 +- 2 files changed, 61 insertions(+), 41 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java index 177a91ad..b31f44f8 100644 --- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java +++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java @@ -76,53 +76,76 @@ public class ConfigInitializer Files.createFile(customSettingsPath); } } - private static Map extractEntries(List lines) { Map entries = new HashMap<>(); - String keyRegex = "^\\s*(\\w+)\\s*:\\s*(.*)"; // Capture key and value - Pattern pattern = Pattern.compile(keyRegex); + StringBuilder currentEntry = new StringBuilder(); + String currentKey = null; + int blockIndent = -1; for (String line : lines) { - Matcher matcher = pattern.matcher(line); - if (matcher.find() && !line.trim().startsWith("#")) { - String key = matcher.group(1).trim(); - String value = matcher.group(2).trim(); // Capture the value directly - entries.put(key, line); + if (line.trim().isEmpty()) { + if (currentKey != null) { + currentEntry.append(line).append("\n"); + } + continue; + } + + int indentLevel = getIndentationLevel(line); + if (line.trim().startsWith("#")) { + if (indentLevel <= blockIndent || blockIndent == -1) { + if (currentKey != null) { + entries.put(currentKey, currentEntry.toString().trim()); + currentEntry = new StringBuilder(); + } + currentKey = line.trim().replaceAll("#", "").split(":")[0].trim(); + blockIndent = indentLevel; + } + currentEntry.append(line).append("\n"); + } else if (indentLevel == 0 || indentLevel <= blockIndent) { + if (currentKey != null) { + entries.put(currentKey, currentEntry.toString().trim()); + currentEntry = new StringBuilder(); + } + currentKey = line.split(":")[0].trim(); + blockIndent = indentLevel; + currentEntry.append(line).append("\n"); + } else { + currentEntry.append(line).append("\n"); } } + + if (currentKey != null) { + entries.put(currentKey, currentEntry.toString().trim()); + } + return entries; } - private static List mergeConfigs( - List templateLines, - Map templateEntries, - Map userEntries) { + private static List mergeConfigs(List templateLines, Map templateEntries, Map userEntries) { List mergedLines = new ArrayList<>(); Set handledKeys = new HashSet<>(); - for (String line : templateLines) { - String cleanLine = line.split("#")[0].trim(); - if (!cleanLine.isEmpty() && cleanLine.contains(":")) { - String key = cleanLine.split(":")[0].trim(); - if (userEntries.containsKey(key)) { - // Always use user's entry if exists - mergedLines.add(userEntries.get(key)); - handledKeys.add(key); - } else { - // Use template's entry if no user entry - mergedLines.add(line); - } - } else { - // Add comments and other lines directly - mergedLines.add(line); - } - } + String currentBlockKey = null; + int blockIndent = -1; - // Add user entries not present in the template at the end - for (String key : userEntries.keySet()) { - if (!handledKeys.contains(key)) { - mergedLines.add(userEntries.get(key)); + for (String line : templateLines) { + if (line.trim().isEmpty()) { + mergedLines.add(line); + continue; + } + + int indentLevel = getIndentationLevel(line); + if (indentLevel == 0 || (indentLevel <= blockIndent && !line.trim().startsWith("#"))) { + currentBlockKey = line.split(":")[0].trim(); + blockIndent = indentLevel; + } + + if (userEntries.containsKey(currentBlockKey) && !handledKeys.contains(currentBlockKey)) { + mergedLines.add(userEntries.get(currentBlockKey)); + handledKeys.add(currentBlockKey); + } else if (!handledKeys.contains(currentBlockKey)) { + mergedLines.add(line); } } @@ -130,13 +153,13 @@ public class ConfigInitializer } + private static List cleanInvalidYamlEntries(List lines) { List cleanedLines = new ArrayList<>(); for (int i = 0; i < lines.size(); i++) { String line = lines.get(i); String trimmedLine = line.trim(); - // Ignore commented lines and lines that don't look like key-only entries if (trimmedLine.startsWith("#") || !trimmedLine.endsWith(":") || trimmedLine.contains(" ")) { @@ -144,10 +167,7 @@ public class ConfigInitializer continue; } - // For potential key-only lines, check the next line to determine context if (isKeyWithoutChildrenOrValue(i, lines)) { - // Skip adding the current line since it's a key without any following value or - // children continue; } diff --git a/src/main/resources/settings.yml.template b/src/main/resources/settings.yml.template index 7d2047c3..45f1762d 100644 --- a/src/main/resources/settings.yml.template +++ b/src/main/resources/settings.yml.template @@ -21,10 +21,10 @@ system: showUpdate: true # see when a new update is available showUpdateOnlyAdmin: false # Only admins can see when a new update is available, depending on showUpdate it must be set to 'true' -#ui: -# appName: exampleAppName # Application's visible name -# homeDescription: I am a description # Short description or tagline shown on homepage. -# appNameNavbar: navbarName # Name displayed on the navigation bar +ui: + appName: null # Application's visible name + homeDescription: null # Short description or tagline shown on homepage. + appNameNavbar: null # Name displayed on the navigation bar endpoints: toRemove: [] # List endpoints to disable (e.g. ['img-to-pdf', 'remove-pages']) From 547f231e29ddbd8ae9d244683eccafc274b92393 Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Sun, 5 May 2024 12:40:18 +0200 Subject: [PATCH 189/200] Update messages_it_IT.properties (#1165) --- src/main/resources/messages_it_IT.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 6f3ce31b..fb1f439e 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -114,7 +114,7 @@ navbar.settings=Impostazioni ############# settings.title=Impostazioni settings.update=Aggiornamento disponibile -settings.updateAvailable={0} is the current installed version. A new version ({1}) is available. +settings.updateAvailable={0} è la versione attualmente installata. Una nuova versione ({1}) è disponibile. settings.appVersion=Versione App: settings.downloadOption.title=Scegli opzione di download (Per file singoli non compressi): settings.downloadOption.1=Apri in questa finestra From d6b1fec69d7f9cfa7b62ec270fffa4cb5b0f6186 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 12:18:52 +0100 Subject: [PATCH 190/200] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a1d2e85b..651a16d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:20240329 COPY scripts /scripts COPY pipeline /pipeline COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/ -COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/ +#COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/ COPY build/libs/*.jar app.jar ARG VERSION_TAG From ac5273244c42fe5ccf7e80ce3e637f3554ac6d33 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 13:33:17 +0100 Subject: [PATCH 191/200] flatten (#1167) --- .../SPDF/config/ConfigInitializer.java | 14 ++-- .../config/security/InitialSecuritySetup.java | 2 +- .../api/misc/FlattenController.java | 84 +++++++++++++++++++ .../SPDF/model/api/misc/FlattenRequest.java | 17 ++++ src/main/resources/messages_ar_AR.properties | 1 + src/main/resources/messages_bg_BG.properties | 1 + src/main/resources/messages_ca_CA.properties | 1 + src/main/resources/messages_de_DE.properties | 1 + src/main/resources/messages_el_GR.properties | 1 + src/main/resources/messages_en_GB.properties | 3 +- src/main/resources/messages_en_US.properties | 1 + src/main/resources/messages_es_ES.properties | 1 + src/main/resources/messages_eu_ES.properties | 1 + src/main/resources/messages_fr_FR.properties | 1 + src/main/resources/messages_hi_IN.properties | 1 + src/main/resources/messages_hu_HU.properties | 1 + src/main/resources/messages_id_ID.properties | 1 + src/main/resources/messages_it_IT.properties | 1 + src/main/resources/messages_ja_JP.properties | 1 + src/main/resources/messages_ko_KR.properties | 1 + src/main/resources/messages_nl_NL.properties | 1 + src/main/resources/messages_pl_PL.properties | 1 + src/main/resources/messages_pt_BR.properties | 1 + src/main/resources/messages_pt_PT.properties | 1 + src/main/resources/messages_ro_RO.properties | 1 + src/main/resources/messages_ru_RU.properties | 1 + .../resources/messages_sr_LATN_RS.properties | 1 + src/main/resources/messages_sv_SE.properties | 1 + src/main/resources/messages_tr_TR.properties | 1 + src/main/resources/messages_uk_UA.properties | 1 + src/main/resources/messages_zh_CN.properties | 1 + src/main/resources/messages_zh_TW.properties | 1 + .../resources/templates/misc/flatten.html | 36 ++------ 33 files changed, 145 insertions(+), 38 deletions(-) create mode 100644 src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java create mode 100644 src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java index b31f44f8..394baeb1 100644 --- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java +++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java @@ -13,8 +13,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -76,6 +74,7 @@ public class ConfigInitializer Files.createFile(customSettingsPath); } } + private static Map extractEntries(List lines) { Map entries = new HashMap<>(); StringBuilder currentEntry = new StringBuilder(); @@ -121,8 +120,10 @@ public class ConfigInitializer return entries; } - - private static List mergeConfigs(List templateLines, Map templateEntries, Map userEntries) { + private static List mergeConfigs( + List templateLines, + Map templateEntries, + Map userEntries) { List mergedLines = new ArrayList<>(); Set handledKeys = new HashSet<>(); @@ -141,7 +142,8 @@ public class ConfigInitializer blockIndent = indentLevel; } - if (userEntries.containsKey(currentBlockKey) && !handledKeys.contains(currentBlockKey)) { + if (userEntries.containsKey(currentBlockKey) + && !handledKeys.contains(currentBlockKey)) { mergedLines.add(userEntries.get(currentBlockKey)); handledKeys.add(currentBlockKey); } else if (!handledKeys.contains(currentBlockKey)) { @@ -152,8 +154,6 @@ public class ConfigInitializer return mergedLines; } - - private static List cleanInvalidYamlEntries(List lines) { List cleanedLines = new ArrayList<>(); for (int i = 0; i < lines.size(); i++) { diff --git a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java index b472622b..b483ba10 100644 --- a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java +++ b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java @@ -85,6 +85,7 @@ public class InitialSecuritySetup { // Write back to the file Files.write(path, lines); } + private boolean isValidUUID(String uuid) { if (uuid == null) { return false; @@ -96,5 +97,4 @@ public class InitialSecuritySetup { return false; } } - } diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java new file mode 100644 index 00000000..bdc0a478 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java @@ -0,0 +1,84 @@ +package stirling.software.SPDF.controller.api.misc; + +import java.awt.image.BufferedImage; +import java.io.IOException; + +import org.apache.pdfbox.Loader; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.PDPageContentStream; +import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory; +import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; +import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; +import org.apache.pdfbox.rendering.ImageType; +import org.apache.pdfbox.rendering.PDFRenderer; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import stirling.software.SPDF.model.PdfMetadata; +import stirling.software.SPDF.model.api.misc.FlattenRequest; +import stirling.software.SPDF.utils.PdfUtils; +import stirling.software.SPDF.utils.WebResponseUtils; + +@RestController +@RequestMapping("/api/v1/misc") +@Tag(name = "Misc", description = "Miscellaneous APIs") +public class FlattenController { + + @PostMapping(consumes = "multipart/form-data", value = "/flatten") + @Operation( + summary = "Flatten PDF form fields or full page", + description = + "Flattening just PDF form fields or converting each page to images to make text unselectable. Input: PDF, Output: PDF. Type: SISO") + public ResponseEntity flatten(@ModelAttribute FlattenRequest request) throws Exception { + MultipartFile file = request.getFileInput(); + + PDDocument document = Loader.loadPDF(file.getBytes()); + PdfMetadata metadata = PdfUtils.extractMetadataFromPdf(document); + Boolean flattenOnlyForms = request.getFlattenOnlyForms(); + + if (Boolean.TRUE.equals(flattenOnlyForms)) { + PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm(); + if (acroForm != null) { + acroForm.flatten(); + } + return WebResponseUtils.pdfDocToWebResponse( + document, Filenames.toSimpleFileName(file.getOriginalFilename())); + } else { + // flatten whole page aka convert each page to image and readd it (making text + // unselectable) + PDFRenderer pdfRenderer = new PDFRenderer(document); + PDDocument newDocument = new PDDocument(); + int numPages = document.getNumberOfPages(); + for (int i = 0; i < numPages; i++) { + try { + BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300, ImageType.RGB); + PDPage page = new PDPage(); + page.setMediaBox(document.getPage(i).getMediaBox()); + newDocument.addPage(page); + try (PDPageContentStream contentStream = + new PDPageContentStream(newDocument, page)) { + PDImageXObject pdImage = JPEGFactory.createFromImage(newDocument, image); + float pageWidth = page.getMediaBox().getWidth(); + float pageHeight = page.getMediaBox().getHeight(); + + contentStream.drawImage(pdImage, 0, 0, pageWidth, pageHeight); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + PdfUtils.setMetadataToPdf(newDocument, metadata); + return WebResponseUtils.pdfDocToWebResponse( + newDocument, Filenames.toSimpleFileName(file.getOriginalFilename())); + } + } +} diff --git a/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java b/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java new file mode 100644 index 00000000..c87d1974 --- /dev/null +++ b/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java @@ -0,0 +1,17 @@ +package stirling.software.SPDF.model.api.misc; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import stirling.software.SPDF.model.api.PDFFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class FlattenRequest extends PDFFile { + + @Schema( + description = + "True to flatten only the forms, false to flatten full PDF (Convert page to image)") + private Boolean flattenOnlyForms; +} diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index c1102346..c6119110 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/src/main/resources/messages_ar_AR.properties @@ -694,6 +694,7 @@ repair.submit=الإصلاح #flatten flatten.title=تسطيح flatten.header=تسوية ملفات PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=تسطيح diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 865522f6..ca196110 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/src/main/resources/messages_bg_BG.properties @@ -694,6 +694,7 @@ repair.submit=Поправи #flatten flatten.title=Изравнете flatten.header=Изравнете PDF-и +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Изравнете diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index c2e2e476..41f4f662 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/src/main/resources/messages_ca_CA.properties @@ -694,6 +694,7 @@ repair.submit=Reparar #flatten flatten.title=Aplanar flatten.header=Aplana els PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Aplanar diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index a007f314..6cbd3a29 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/src/main/resources/messages_de_DE.properties @@ -694,6 +694,7 @@ repair.submit=Reparieren #flatten flatten.title=Abflachen flatten.header=PDFs reduzieren +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Abflachen diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 08e5f329..e4d2537c 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/src/main/resources/messages_el_GR.properties @@ -694,6 +694,7 @@ repair.submit=Επιδιόρθωση #flatten flatten.title=Flatten flatten.header=Flatten PDFs +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Flatten diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index ed3779cc..6189f56b 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -693,7 +693,8 @@ repair.submit=Repair #flatten flatten.title=Flatten -flatten.header=Flatten PDFs +flatten.header=Flatten PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Flatten diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index df24e3a2..2ecaa2e8 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -694,6 +694,7 @@ repair.submit=Repair #flatten flatten.title=Flatten flatten.header=Flatten PDFs +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Flatten diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 96008bed..275bf1d1 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/src/main/resources/messages_es_ES.properties @@ -694,6 +694,7 @@ repair.submit=Reparar #flatten flatten.title=Aplanar flatten.header=Acoplar archivos PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Aplanar diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 5df9bc3d..c9337e03 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/src/main/resources/messages_eu_ES.properties @@ -694,6 +694,7 @@ repair.submit=Konpondu #flatten flatten.title=Lautu flatten.header=Akoplatu PDF fitxategiak +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Lautu diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 6624b01c..06068ffc 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -694,6 +694,7 @@ repair.submit=Réparer #flatten flatten.title=Rendre inerte flatten.header=Rendre inerte +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Rendre inerte diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 355ccb9e..9bcddca1 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/src/main/resources/messages_hi_IN.properties @@ -694,6 +694,7 @@ repair.submit=मरम्मत #flatten flatten.title=समतल करें flatten.header=पीडीएफ़ समतल करें +flatten.flattenOnlyForms=Flatten only forms flatten.submit=समतल करें diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 3b2811d4..625e8b23 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/src/main/resources/messages_hu_HU.properties @@ -694,6 +694,7 @@ repair.submit=Javítás #flatten flatten.title=Kiegyenlítés flatten.header=PDF-ek kiegyenlítése +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Kiegyenlítés diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index 370b01ad..fd5c3e31 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/src/main/resources/messages_id_ID.properties @@ -694,6 +694,7 @@ repair.submit=Perbaiki #flatten flatten.title=Ratakan flatten.header=Ratakan PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Ratakan diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index fb1f439e..4a867e83 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -694,6 +694,7 @@ repair.submit=Ripara #flatten flatten.title=Appiattisci flatten.header=Appiattisci PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Appiattisci diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index febd561c..9f981333 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/src/main/resources/messages_ja_JP.properties @@ -694,6 +694,7 @@ repair.submit=修復 #flatten flatten.title=平坦化 flatten.header=PDFを平坦化する +flatten.flattenOnlyForms=Flatten only forms flatten.submit=平坦化 diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index e8604477..da011ec6 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/src/main/resources/messages_ko_KR.properties @@ -694,6 +694,7 @@ repair.submit=복구 #flatten flatten.title=평탄화 flatten.header=PDF 문서의 레이어 평탄화 +flatten.flattenOnlyForms=Flatten only forms flatten.submit=평탄화 diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index 6ba6a7b3..cbbf7b43 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/src/main/resources/messages_nl_NL.properties @@ -694,6 +694,7 @@ repair.submit=Repareren #flatten flatten.title=Afvlakken flatten.header=PDF's afvlakken +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Afvlakken diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index ee96d34f..757647ee 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/src/main/resources/messages_pl_PL.properties @@ -694,6 +694,7 @@ repair.submit=Napraw #flatten flatten.title=Spłaszcz flatten.header=Spłaszcz dokument(y) PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Spłaszcz diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index 715615e4..97ac151e 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/src/main/resources/messages_pt_BR.properties @@ -694,6 +694,7 @@ repair.submit=Reparar #flatten flatten.title=Achatar flatten.header=Achatar PDFs +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Achatar diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index 7a5541e2..fcde52ad 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/src/main/resources/messages_pt_PT.properties @@ -694,6 +694,7 @@ repair.submit=Reparar #flatten flatten.title=Achatar flatten.header=Achatar PDFs +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Achatar diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 55f5e3d9..1f3daca5 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/src/main/resources/messages_ro_RO.properties @@ -694,6 +694,7 @@ repair.submit=Repară #flatten flatten.title=Nivelare flatten.header=Nivelează documente PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Nivelează diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index fc7f3965..4517e100 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/src/main/resources/messages_ru_RU.properties @@ -694,6 +694,7 @@ repair.submit=Ремонт #flatten flatten.title=Сглаживание flatten.header=Сглаживание PDF ов +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Сгладить diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 07c32db3..708dc2d8 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/src/main/resources/messages_sr_LATN_RS.properties @@ -694,6 +694,7 @@ repair.submit=Popravi #flatten flatten.title=Ravnanje flatten.header=Ravnanje PDF fajlova +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Ravnanje diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index ac29f553..f621c73c 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/src/main/resources/messages_sv_SE.properties @@ -694,6 +694,7 @@ repair.submit=Reparera #flatten flatten.title=Platta till flatten.header=Placera PDF-filer +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Platta till diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index c8d3bab6..8484e555 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/src/main/resources/messages_tr_TR.properties @@ -694,6 +694,7 @@ repair.submit=Onar #flatten flatten.title=Düzleştir flatten.header=PDF'leri Düzleştir +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Düzleştir diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index 6cd0ace0..1ace290c 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/src/main/resources/messages_uk_UA.properties @@ -694,6 +694,7 @@ repair.submit=Ремонтувати #flatten flatten.title=Згладжування flatten.header=Згладжування PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=Згладити diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index 7ea7ed55..ca04fc36 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/src/main/resources/messages_zh_CN.properties @@ -694,6 +694,7 @@ repair.submit=修复 #flatten flatten.title=展平 flatten.header=展平 PDF +flatten.flattenOnlyForms=Flatten only forms flatten.submit=展平 diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 2c089b13..8391da55 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/src/main/resources/messages_zh_TW.properties @@ -694,6 +694,7 @@ repair.submit=修復 #flatten flatten.title=平坦化 flatten.header=PDF 平坦化 +flatten.flattenOnlyForms=Flatten only forms flatten.submit=平坦化 diff --git a/src/main/resources/templates/misc/flatten.html b/src/main/resources/templates/misc/flatten.html index 49710831..bbc06f58 100644 --- a/src/main/resources/templates/misc/flatten.html +++ b/src/main/resources/templates/misc/flatten.html @@ -13,36 +13,14 @@

      -
      -
      -
      -
      + +
      +
      + + +
      +
      - -
      From d17db24aa95bca276bc49fa1b9fd6b072815da75 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 13:53:26 +0100 Subject: [PATCH 192/200] #1160 update rhefs (#1169) Update common.html --- src/main/resources/templates/fragments/common.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index 3d6cc9fd..9e879c4c 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -10,12 +10,12 @@ - - - - - - + + + + + + @@ -159,4 +159,4 @@
      - \ No newline at end of file + From 66ce7511caa5a510cf06cf1277927c3dee02fb04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 14:01:42 +0100 Subject: [PATCH 193/200] :memo: Update README: Translation Progress Table (#1168) :memo: Sync README > Made via sync_files.yml Co-authored-by: GitHub Action action@github.com --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 82f0dcb7..1860c6f3 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ Stirling PDF currently supports 27! | English (English) (en_GB) | ![100%](https://geps.dev/progress/100) | | English (US) (en_US) | ![100%](https://geps.dev/progress/100) | | Arabic (العربية) (ar_AR) | ![42%](https://geps.dev/progress/42) | -| German (Deutsch) (de_DE) | ![100%](https://geps.dev/progress/100) | +| German (Deutsch) (de_DE) | ![99%](https://geps.dev/progress/99) | | French (Français) (fr_FR) | ![91%](https://geps.dev/progress/91) | | Spanish (Español) (es_ES) | ![99%](https://geps.dev/progress/99) | | Simplified Chinese (简体中文) (zh_CN) | ![98%](https://geps.dev/progress/98) | @@ -178,11 +178,11 @@ Stirling PDF currently supports 27! | Romanian (Română) (ro_RO) | ![41%](https://geps.dev/progress/41) | | Korean (한국어) (ko_KR) | ![91%](https://geps.dev/progress/91) | | Portuguese Brazilian (Português) (pt_BR) | ![64%](https://geps.dev/progress/64) | -| Russian (Русский) (ru_RU) | ![91%](https://geps.dev/progress/91) | +| Russian (Русский) (ru_RU) | ![90%](https://geps.dev/progress/90) | | Basque (Euskara) (eu_ES) | ![66%](https://geps.dev/progress/66) | | Japanese (日本語) (ja_JP) | ![91%](https://geps.dev/progress/91) | | Dutch (Nederlands) (nl_NL) | ![88%](https://geps.dev/progress/88) | -| Greek (Ελληνικά) (el_GR) | ![88%](https://geps.dev/progress/88) | +| Greek (Ελληνικά) (el_GR) | ![89%](https://geps.dev/progress/89) | | Turkish (Türkçe) (tr_TR) | ![99%](https://geps.dev/progress/99) | | Indonesia (Bahasa Indonesia) (id_ID) | ![82%](https://geps.dev/progress/82) | | Hindi (हिंदी) (hi_IN) | ![82%](https://geps.dev/progress/82) | From f4fcede77149875d9d0f295179c7b01ec3e1bd48 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 20:45:52 +0100 Subject: [PATCH 194/200] Update ProcessExecutor.java --- .../java/stirling/software/SPDF/utils/ProcessExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java b/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java index c8eb7517..93fdbd54 100644 --- a/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java +++ b/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java @@ -58,10 +58,10 @@ public class ProcessExecutor { long timeoutMinutes = switch (key) { case LIBRE_OFFICE -> 30; - case PDFTOHTML -> 5; + case PDFTOHTML -> 20; case OCR_MY_PDF -> 30; case PYTHON_OPENCV -> 30; - case GHOSTSCRIPT -> 5; + case GHOSTSCRIPT -> 30; case WEASYPRINT -> 30; case INSTALL_APP -> 60; case CALIBRE -> 30; From 00f7fe7ac35f165c7368ecaaf04fbb9b23701a00 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 20:46:22 +0100 Subject: [PATCH 195/200] Update application.properties --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5d1438..a5f12e64 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -24,8 +24,8 @@ spring.devtools.livereload.enabled=true spring.thymeleaf.encoding=UTF-8 -server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m} -spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000} +server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:20m} +spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000} spring.resources.static-locations=file:customFiles/static/ #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/ From 9e3d5a5bc53a824cdcbc71c21e4f9ccb82bcd699 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sun, 5 May 2024 20:50:22 +0100 Subject: [PATCH 196/200] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b8af6629..66817266 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { import com.github.jk1.license.render.* group = 'stirling.software' -version = '0.23.1' +version = '0.23.2' sourceCompatibility = '17' repositories { From bb0b5f052825d6cd97f138b6af3c4536d0f554ac Mon Sep 17 00:00:00 2001 From: "GitHub Action action@github.com" Date: Sun, 5 May 2024 19:50:36 +0000 Subject: [PATCH 197/200] :floppy_disk: Sync Versions > Made via sync_files.yml --- chart/stirling-pdf/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml index c076a0d0..52220bcd 100644 --- a/chart/stirling-pdf/Chart.yaml +++ b/chart/stirling-pdf/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.23.1 +appVersion: 0.23.2 description: locally hosted web application that allows you to perform various operations on PDF files home: https://github.com/Stirling-Tools/Stirling-PDF From 66e566555e31bfdd3a356ffbb063afe93045c2ed Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Mon, 6 May 2024 13:32:23 +0200 Subject: [PATCH 198/200] Update messages_it_IT.properties --- src/main/resources/messages_it_IT.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 4a867e83..e22addfe 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -692,9 +692,9 @@ repair.submit=Ripara #flatten -flatten.title=Appiattisci +flatten.title=Appiattire flatten.header=Appiattisci PDF -flatten.flattenOnlyForms=Flatten only forms +flatten.flattenOnlyForms=Appiattisci solo i moduli flatten.submit=Appiattisci From 503acc94086fb2db311b1327ea0bb42f5b97bd61 Mon Sep 17 00:00:00 2001 From: "pixeebot[bot]" <104101892+pixeebot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 03:44:03 +0000 Subject: [PATCH 199/200] Introduced protections against HTTP header injection / smuggling attacks --- .../SPDF/config/security/UserBasedRateLimitingFilter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java b/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java index 7b3b9b4e..89107697 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java @@ -1,5 +1,6 @@ package stirling.software.SPDF.config.security; +import io.github.pixee.security.Newlines; import java.io.IOException; import java.time.Duration; import java.util.Map; @@ -125,12 +126,12 @@ public class UserBasedRateLimitingFilter extends OncePerRequestFilter { ConsumptionProbe probe = userBucket.tryConsumeAndReturnRemaining(1); if (probe.isConsumed()) { - response.setHeader("X-Rate-Limit-Remaining", Long.toString(probe.getRemainingTokens())); + response.setHeader("X-Rate-Limit-Remaining", Newlines.stripAll(Long.toString(probe.getRemainingTokens()))); filterChain.doFilter(request, response); } else { long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000; response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value()); - response.setHeader("X-Rate-Limit-Retry-After-Seconds", String.valueOf(waitForRefill)); + response.setHeader("X-Rate-Limit-Retry-After-Seconds", Newlines.stripAll(String.valueOf(waitForRefill))); response.getWriter().write("Rate limit exceeded for POST requests."); } } From a04dc605df5615b36b8705bd48b71962f5398478 Mon Sep 17 00:00:00 2001 From: brucengumetro Date: Tue, 7 May 2024 16:05:01 +0700 Subject: [PATCH 200/200] minor spelling fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1860c6f3..31b34009 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,7 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom ### Prerequisites: - User must have the folder ./configs volumed within docker so that it is retained during updates. -- Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. +- Docker users must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. - Then either enable login via the settings.yml file or via setting ``SECURITY_ENABLE_LOGIN`` to ``true`` - Now the initial user will be generated with username ``admin`` and password ``stirling``. On login you will be forced to change the password to a new one. You can also use the environment variables ``SECURITY_INITIALLOGIN_USERNAME`` and ``SECURITY_INITIALLOGIN_PASSWORD`` to set your own straight away (Recommended to remove them after user creation).