From ff2c0057e890b9ecb552df30914333349ea20eb7 Mon Sep 17 00:00:00 2001
From: C4illin <emrik.ostling@gmail.com>
Date: Tue, 3 Jun 2025 18:23:26 +0200
Subject: [PATCH] fix: progress bars on firefox

---
 public/script.js      |  32 ++---
 src/pages/results.tsx | 326 ++++++++++++++----------------------------
 2 files changed, 124 insertions(+), 234 deletions(-)

diff --git a/public/script.js b/public/script.js
index e99ad78..81caee2 100644
--- a/public/script.js
+++ b/public/script.js
@@ -17,20 +17,20 @@ dropZone.addEventListener("dragleave", () => {
 });
 
 dropZone.addEventListener("drop", (e) => {
-    e.preventDefault();
-    dropZone.classList.remove("dragover");
-  
-    const files = e.dataTransfer.files;
-  
-    if (files.length === 0) {
-      console.warn("No files dropped — likely a URL or unsupported source.");
-      return;
-    }
-  
-    for (const file of files) {
-      console.log("Handling dropped file:", file.name);
-      handleFile(file);
-    }
+  e.preventDefault();
+  dropZone.classList.remove("dragover");
+
+  const files = e.dataTransfer.files;
+
+  if (files.length === 0) {
+    console.warn("No files dropped — likely a URL or unsupported source.");
+    return;
+  }
+
+  for (const file of files) {
+    console.log("Handling dropped file:", file.name);
+    handleFile(file);
+  }
 });
 
 // Extracted handleFile function for reusability in drag-and-drop and file input
@@ -40,7 +40,7 @@ function handleFile(file) {
   const row = document.createElement("tr");
   row.innerHTML = `
     <td>${file.name}</td>
-    <td><progress max="100"></progress></td>
+    <td><progress max="100" class="inline-block h-2 appearance-none overflow-hidden rounded-full border-0 bg-neutral-700 bg-none text-accent-500 accent-accent-500 [&::-moz-progress-bar]:bg-accent-500 [&::-webkit-progress-value]:rounded-full [&::-webkit-progress-value]:[background:none] [&[value]::-webkit-progress-value]:bg-accent-500 [&[value]::-webkit-progress-value]:transition-[inline-size]"></progress></td>
     <td>${(file.size / 1024).toFixed(2)} kB</td>
     <td><a onclick="deleteRow(this)">Remove</a></td>
   `;
@@ -207,7 +207,7 @@ const uploadFile = (file) => {
   const formData = new FormData();
   formData.append("file", file, file.name);
 
-  let xhr = new XMLHttpRequest(); 
+  let xhr = new XMLHttpRequest();
 
   xhr.open("POST", `${webroot}/upload`, true);
 
diff --git a/src/pages/results.tsx b/src/pages/results.tsx
index 8d5f916..a1570db 100644
--- a/src/pages/results.tsx
+++ b/src/pages/results.tsx
@@ -7,6 +7,112 @@ import { Header } from "../components/header";
 import { BaseHtml } from "../components/base";
 import db from "../db/db";
 
+function ResultsArticle({ job, files, outputPath }: { job: Jobs, files: Filename[], outputPath: string }) {
+  return (<article class="article">
+    <div class="mb-4 flex items-center justify-between">
+      <h1 class="text-xl">Results</h1>
+      <div>
+        <button
+          type="button"
+          class="float-right w-40 btn-primary"
+          onclick="downloadAll()"
+          {...(files.length !== job.num_files
+            ? { disabled: true, "aria-busy": "true" }
+            : "")}
+        >
+          {files.length === job.num_files
+            ? "Download All"
+            : "Converting..."}
+        </button>
+      </div>
+    </div>
+    <progress
+      max={job.num_files}
+      value={files.length}
+      class={`
+              mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0
+              bg-neutral-700 bg-none text-accent-500 accent-accent-500
+              [&::-moz-progress-bar]:bg-accent-500 [&::-webkit-progress-value]:rounded-full
+              [&::-webkit-progress-value]:[background:none]
+              [&[value]::-webkit-progress-value]:bg-accent-500
+              [&[value]::-webkit-progress-value]:transition-[inline-size]
+            `}
+    />
+    <table class={`
+              w-full table-auto rounded bg-neutral-900 text-left
+              [&_td]:p-4
+              [&_tr]:rounded-sm [&_tr]:border-b [&_tr]:border-neutral-800
+            `}
+    >
+      <thead>
+        <tr>
+          <th class={`
+                    px-2 py-2
+                    sm:px-4
+                  `}
+          >
+            Converted File Name
+          </th>
+          <th class={`
+                    px-2 py-2
+                    sm:px-4
+                  `}
+          >
+            Status
+          </th>
+          <th class={`
+                    px-2 py-2
+                    sm:px-4
+                  `}
+          >
+            View
+          </th>
+          <th class={`
+                    px-2 py-2
+                    sm:px-4
+                  `}>
+            Download
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        {files.map((file) => (
+          <tr>
+            <td safe class="max-w-[20vw] truncate">
+              {file.output_file_name}
+            </td>
+            <td safe>{file.status}</td>
+            <td>
+              <a
+                class={`
+                        text-accent-500 underline
+                        hover:text-accent-400
+                      `}
+                href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
+              >
+                View
+              </a>
+            </td>
+            <td>
+              <a
+                class={`
+                        text-accent-500 underline
+                        hover:text-accent-400
+                      `}
+                href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
+                download={file.output_file_name}
+              >
+                Download
+              </a>
+            </td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  </article>
+  )
+}
+
 export const results = new Elysia()
   .use(userService)
   .get(
@@ -59,114 +165,7 @@ export const results = new Elysia()
                 sm:px-4
               `}
             >
-              <article class="article">
-                <div class="mb-4 flex items-center justify-between">
-                  <h1 class="text-xl">Results</h1>
-                  <div>
-                    <button
-                      type="button"
-                      class="float-right w-40 btn-primary"
-                      onclick="downloadAll()"
-                      {...(files.length !== job.num_files
-                        ? { disabled: true, "aria-busy": "true" }
-                        : "")}
-                    >
-                      {files.length === job.num_files
-                        ? "Download All"
-                        : "Converting..."}
-                    </button>
-                  </div>
-                </div>
-                <progress
-                  max={job.num_files}
-                  value={files.length}
-                  class={`
-                    mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full
-                    border-0 bg-neutral-700 bg-none text-accent-500 accent-accent-500
-                    [&::-moz-progress-bar]:bg-neutral-700 [&::-webkit-progress-value]:rounded-full
-                    [&::-webkit-progress-value]:[background:none]
-                    [&[value]::-webkit-progress-value]:bg-accent-500
-                    [&[value]::-webkit-progress-value]:transition-[inline-size]
-                  `}
-                />
-                <table
-                  class={`
-                    w-full table-auto rounded bg-neutral-900 text-left
-                    [&_td]:p-4
-                    [&_tr]:rounded-sm [&_tr]:border-b [&_tr]:border-neutral-800
-                  `}
-                >
-                  <thead>
-                    <tr>
-                      <th
-                        class={`
-                          px-2 py-2
-                          sm:px-4
-                        `}
-                      >
-                        Converted File Name
-                      </th>
-                      <th
-                        class={`
-                          px-2 py-2
-                          sm:px-4
-                        `}
-                      >
-                        Status
-                      </th>
-                      <th
-                        class={`
-                          px-2 py-2
-                          sm:px-4
-                        `}
-                      >
-                        View
-                      </th>
-                      <th
-                        class={`
-                          px-2 py-2
-                          sm:px-4
-                        `}
-                      >
-                        Download
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {files.map((file) => (
-                      <tr>
-                        <td safe class="max-w-[20vw] truncate">
-                          {file.output_file_name}
-                        </td>
-                        <td safe>{file.status}</td>
-                        <td>
-                          <a
-                            class={`
-                              text-accent-500 underline
-                              hover:text-accent-400
-                            `}
-                            href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
-                          >
-                            View
-                          </a>
-                        </td>
-                        <td>
-                          <a
-                            class={`
-                              text-accent-500 underline
-                              hover:text-accent-400
-                            `}
-                            href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
-                            download={file.output_file_name}
-                          >
-                            Download
-                          </a>
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-              </article>
+              <ResultsArticle job={job} files={files} outputPath={outputPath} />
             </main>
             <script src={`${WEBROOT}/results.js`} defer />
           </>
@@ -210,115 +209,6 @@ export const results = new Elysia()
         .as(Filename)
         .all(params.jobId);
 
-      return (
-        <article class="article">
-          <div class="mb-4 flex items-center justify-between">
-            <h1 class="text-xl">Results</h1>
-            <div>
-              <button
-                type="button"
-                class="float-right w-40 btn-primary"
-                onclick="downloadAll()"
-                {...(files.length !== job.num_files
-                  ? { disabled: true, "aria-busy": "true" }
-                  : "")}
-              >
-                {files.length === job.num_files
-                  ? "Download All"
-                  : "Converting..."}
-              </button>
-            </div>
-          </div>
-          <progress
-            max={job.num_files}
-            value={files.length}
-            class={`
-              mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0
-              bg-neutral-700 bg-none text-accent-500 accent-accent-500
-              [&::-moz-progress-bar]:bg-neutral-700 [&::-webkit-progress-value]:rounded-full
-              [&::-webkit-progress-value]:[background:none]
-              [&[value]::-webkit-progress-value]:bg-accent-500
-              [&[value]::-webkit-progress-value]:transition-[inline-size]
-            `}
-          />
-          <table
-            class={`
-              w-full table-auto rounded bg-neutral-900 text-left
-              [&_td]:p-4
-              [&_tr]:rounded-sm [&_tr]:border-b [&_tr]:border-neutral-800
-            `}
-          >
-            <thead>
-              <tr>
-                <th
-                  class={`
-                    px-2 py-2
-                    sm:px-4
-                  `}
-                >
-                  Converted File Name
-                </th>
-                <th
-                  class={`
-                    px-2 py-2
-                    sm:px-4
-                  `}
-                >
-                  Status
-                </th>
-                <th
-                  class={`
-                    px-2 py-2
-                    sm:px-4
-                  `}
-                >
-                  View
-                </th>
-                <th
-                  class={`
-                    px-2 py-2
-                    sm:px-4
-                  `}
-                >
-                  Download
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              {files.map((file) => (
-                <tr>
-                  <td safe class="max-w-[20vw] truncate">
-                    {file.output_file_name}
-                  </td>
-                  <td safe>{file.status}</td>
-                  <td>
-                    <a
-                      class={`
-                        text-accent-500 underline
-                        hover:text-accent-400
-                      `}
-                      href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
-                    >
-                      View
-                    </a>
-                  </td>
-                  <td>
-                    <a
-                      class={`
-                        text-accent-500 underline
-                        hover:text-accent-400
-                      `}
-                      href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
-                      download={file.output_file_name}
-                    >
-                      Download
-                    </a>
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </article>
-      );
+      return <ResultsArticle job={job} files={files} outputPath={outputPath} />;
     },
   )
\ No newline at end of file