diff --git a/assets/index.css b/assets/index.css
index b32e7d0..8340d85 100644
--- a/assets/index.css
+++ b/assets/index.css
@@ -97,38 +97,46 @@ body {
padding: 0 1em;
}
-.main th {
+.uploaders-table th,
+.paths-table th {
text-align: left;
font-weight: unset;
color: #5c5c5c;
white-space: nowrap;
}
-.main td {
+.uploaders-table td,
+.paths-table td {
white-space: nowrap;
}
-.main .cell-name {
- width: 400px;
+.uploaders-table .cell-name,
+.paths-table .cell-name {
+ width: 500px;
}
-.main .cell-mtime {
+.uploaders-table .cell-status {
+ width: 80px;
+ padding-left: 0.6em;
+}
+
+.paths-table .cell-actions {
+ width: 60px;
+ display: flex;
+ padding-left: 0.6em;
+}
+
+.paths-table .cell-mtime {
width: 120px;
padding-left: 0.6em;
}
-.main .cell-size {
+.paths-table .cell-size {
text-align: right;
width: 70px;
padding-left: 0.6em;
}
-.main .cell-actions {
- width: 60px;
- display: flex;
- padding-left: 0.6em;
-}
-
.path svg {
height: 100%;
@@ -158,7 +166,7 @@ body {
padding-left: 0.4em;
}
-.uploaders {
+.uploaders-table {
padding: 0.5em 0;
}
diff --git a/assets/index.js b/assets/index.js
index 6cbe802..e2403b1 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -1,11 +1,11 @@
-let $tbody, $uploaders;
+let $pathsTable, $pathsTableBody, $uploadersTable;
let baseDir;
class Uploader {
idx;
file;
name;
- $elem;
+ $uploadStatus;
static globalIdx = 0;
constructor(file, dirs) {
this.name = [...dirs, file.name].join("/");
@@ -19,12 +19,16 @@ class Uploader {
if (file.name == baseDir + ".zip") {
url += "?unzip";
}
- $uploaders.insertAdjacentHTML("beforeend", `
-
`);
- this.$elem = document.getElementById(`file${idx}`);
+ $uploadersTable.insertAdjacentHTML("beforeend", `
+
+
+ ${getSvg("File")}
+ ${name}
+ |
+ |
+
`);
+ $uploadersTable.classList.remove("hidden");
+ this.$uploadStatus = document.getElementById(`uploadStatus${idx}`);
const ajax = new XMLHttpRequest();
ajax.upload.addEventListener("progress", e => this.progress(e), false);
@@ -45,15 +49,15 @@ class Uploader {
progress(event) {
const percent = (event.loaded / event.total) * 100;
- this.$elem.innerHTML = `${this.name} (${percent.toFixed(2)}%)`;
+ this.$uploadStatus.innerHTML = `${percent.toFixed(2)}%`;
}
complete() {
- this.$elem.innerHTML = `${this.name}`;
+ this.$uploadStatus.innerHTML = `✓`;
}
fail() {
- this.$elem.innerHTML = `${this.name}`;
+ this.$uploadStatus.innerHTML = `✗`;
}
}
@@ -110,15 +114,15 @@ function addPath(file, index) {
${actionDelete}
`
- $tbody.insertAdjacentHTML("beforeend", `
+ $pathsTableBody.insertAdjacentHTML("beforeend", `
-
- ${getSvg(file.path_type)}
- ${file.name}
- |
-${formatMtime(file.mtime)} |
-${formatSize(file.size)} |
-${actionCell}
+
+ ${getSvg(file.path_type)}
+ ${file.name}
+ |
+ ${formatMtime(file.mtime)} |
+ ${formatSize(file.size)} |
+ ${actionCell}
`)
}
@@ -134,6 +138,10 @@ async function deletePath(index) {
});
if (res.status === 200) {
document.getElementById(`addPath${index}`).remove();
+ DATA.paths[index] = null;
+ if (!DATA.paths.find(v => !!v)) {
+ $pathsTable.classList.add("hidden");
+ }
} else {
throw new Error(await res.text())
}
@@ -224,19 +232,23 @@ function formatSize(size) {
}
function ready() {
- $tbody = document.querySelector(".main tbody");
- $uploaders = document.querySelector(".uploaders");
+ $pathsTable = document.querySelector(".paths-table")
+ $pathsTableBody = document.querySelector(".paths-table tbody");
+ $uploadersTable = document.querySelector(".uploaders-table");
addBreadcrumb(DATA.breadcrumb);
if (Array.isArray(DATA.paths)) {
const len = DATA.paths.length;
+ if (len > 0) {
+ $pathsTable.classList.remove("hidden");
+ }
for (let i = 0; i < len; i++) {
addPath(DATA.paths[i], i);
}
}
if (DATA.allow_upload) {
dropzone();
- document.querySelector(".upload-control").classList.remove(["hidden"]);
+ document.querySelector(".upload-control").classList.remove("hidden");
document.getElementById("file").addEventListener("change", e => {
const files = e.target.files;
for (let file of files) {
@@ -244,4 +256,4 @@ function ready() {
}
});
}
-}
\ No newline at end of file
+}