From 38925ea4cab2efa00b178035254749a6bafea691 Mon Sep 17 00:00:00 2001
From: Saud Fatayerji <saudfatayerji@gmail.com>
Date: Sun, 5 Feb 2023 22:04:37 +0300
Subject: [PATCH] Fixed merge conflict. Cleaned up code

---
 .../resources/templates/fragments/common.html |  4 +-
 src/main/resources/templates/rotate-pdf.html  | 58 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html
index 18352416..4340d5e8 100644
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -102,7 +102,7 @@
 	<div class="custom-file-chooser">
 		<div class="custom-file">
 			<input type="file" class="custom-file-input" th:name="${name}" th:id="${name}+'-input'" th:multiple="${multiple}">
-			<label class="custom-file-label" th:for="${name}+'-input'">Choose file</label>
+			<label class="custom-file-label" th:for="${name}+'-input'" th:text="#{pdfPrompt}"></label>
 		</div>
 	</div>
 
@@ -113,7 +113,7 @@
 			if (fileNames) {
 				$(this).siblings(".custom-file-label").addClass("selected").html(fileNames);
 			} else {
-				$(this).siblings(".custom-file-label").addClass("selected").html("Choose file");
+				$(this).siblings(".custom-file-label").addClass("selected").html([[#{pdfPrompt}]]);
 			}
 		});
 	</script>
diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html
index 2ce89690..68418b69 100644
--- a/src/main/resources/templates/rotate-pdf.html
+++ b/src/main/resources/templates/rotate-pdf.html
@@ -19,24 +19,26 @@
 					<div th:replace="fragments/common :: fileSelector(name='fileInput', multiple=false)"></div>
 					<input type="hidden" id="angleInput" name="angle" value="0">
 
-					<div class="previewContainer">
-						<img id="pdf-preview"/>
-					</div>
+					<div id="editSection" style="display: none">
+						<div class="previewContainer">
+							<img id="pdf-preview"/>
+						</div>
 
-					<div class="buttonContainer">
-						<button type="button" class="btn btn-secondary" onclick="rotate(-90)">
-							<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
-								<path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2v1z"/>
-								<path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z"/>
-							</svg>
-						</button>
-						<button type="submit" class="btn btn-primary">Complete</button>
-						<button type="button" class="btn btn-secondary" onclick="rotate(90)">
-							<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
-								<path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
-								<path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
-							</svg>
-						</button>
+						<div class="buttonContainer">
+							<button type="button" class="btn btn-secondary" onclick="rotate(-90)">
+								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-counterclockwise" viewBox="0 0 16 16">
+									<path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2v1z"/>
+									<path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z"/>
+								</svg>
+							</button>
+							<button type="submit" class="btn btn-primary">Complete</button>
+							<button type="button" class="btn btn-secondary" onclick="rotate(90)">
+								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+									<path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
+									<path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
+								</svg>
+							</button>
+						</div>
 					</div>
 				</form>
 
@@ -54,14 +56,11 @@
 		fileInput.addEventListener("change", async function() {
 			console.log("loading pdf");
 
-			preview.parentElement.style.display = "block";
-			document.querySelector(".buttonContainer").style.display = "flex";
+			document.querySelector("#editSection").style.display = "";
 
-			var file = fileInput.files[0];
-			var url = URL.createObjectURL(file)
-			var loadingTask = pdfjsLib.getDocument(url);
+			var url = URL.createObjectURL(fileInput.files[0])
 
-			const pdf = await loadingTask.promise;
+			const pdf = await pdfjsLib.getDocument(url).promise;
 			const page = await pdf.getPage(1);
 
 			const canvas = document.createElement("canvas");
@@ -77,8 +76,8 @@
 
 			// render the page onto the canvas
 			var renderContext = {
-			  canvasContext: canvas.getContext("2d"),
-			  viewport: page.getViewport({ scale: 1 })
+			   	canvasContext: canvas.getContext("2d"),
+			  	viewport: page.getViewport({ scale: 1 })
 			};
 
 			await page.render(renderContext).promise;
@@ -115,20 +114,17 @@
 			width: 100%;
 			border: 1px solid rgba(0,0,0,.125);
 			border-radius: 0.25rem;
-			margin: 1rem 0 0;
+			margin: 1rem 0;
 			padding: 15px;
-			display: none;
+			display: block;
 			overflow: hidden;
 			position: relative;
 		}
 
 		.buttonContainer {
-			display: none;
+			display: flex;
 			justify-content: space-around;
 		}
-		button {
-			top-margin: -100%;
-		}
 	</style>
 </body>