diff --git a/Website/apiConnector.js b/Website/apiConnector.js
index a6635dc..816f19f 100644
--- a/Website/apiConnector.js
+++ b/Website/apiConnector.js
@@ -66,7 +66,7 @@ async function GetTaskTypes(){
return json;
}
async function GetRunningTasks(){
- var uri = apiUri + "/Tranga/GetRunningTasks";
+ var uri = apiUri + "/Tasks/GetRunningTasks";
let json = await GetData(uri);
return json;
}
@@ -117,4 +117,10 @@ function DeleteTask(taskType, connectorName, publicationId){
function DequeueTask(taskType, connectorName, publicationId){
var uri = apiUri + `/Queue/Dequeue?taskType=${taskType}&connectorName=${connectorName}&publicationId=${publicationId}`;
DeleteData(uri);
+}
+
+async function GetQueue(){
+ var uri = apiUri + "/Queue/GetList";
+ let json = await GetData(uri);
+ return json;
}
\ No newline at end of file
diff --git a/Website/index.html b/Website/index.html
index f7241e6..a13e402 100644
--- a/Website/index.html
+++ b/Website/index.html
@@ -95,7 +95,16 @@
diff --git a/Website/interaction.js b/Website/interaction.js
index 7671103..cc4ff30 100644
--- a/Website/interaction.js
+++ b/Website/interaction.js
@@ -26,7 +26,9 @@ const settingKomgaPass = document.querySelector("#komgaPassword");
const settingKomgaTime = document.querySelector("#komgaUpdateTime");
const settingKomgaConfigured = document.querySelector("#komgaConfigured");
const settingApiUri = document.querySelector("#settingApiUri");
-
+const tagTasksRunning = document.querySelector("#tasksRunningTag");
+const tagTasksQueued = document.querySelector("#tasksQueuedTag");
+const tagTasksTotal = document.querySelector("#totalTasksTag");
settingsCog.addEventListener("click", () => OpenSettings());
document.querySelector("#blurBackgroundSettingsPopup").addEventListener("click", () => HideSettings());
@@ -247,6 +249,21 @@ GetDownloadTasks()
tasks.push(task);
}));
+GetRunningTasks()
+ .then(json => {
+ tagTasksRunning.innerText = json.length;
+ });
+
+GetDownloadTasks()
+ .then(json => {
+ tagTasksTotal.innerText = json.length;
+ });
+
+GetQueue()
+ .then(json => {
+ tagTasksQueued.innerText = json.length;
+ })
+
setInterval(() => {
//Tasks from API
var cTasks = [];
@@ -268,6 +285,20 @@ setInterval(() => {
}
}
);
+
+ GetRunningTasks()
+ .then(json => {
+ tagTasksRunning.innerText = json.length;
+ });
+
+ GetDownloadTasks()
+ .then(json => {
+ tagTasksTotal.innerText = json.length;
+ });
+ GetQueue()
+ .then(json => {
+ tagTasksQueued.innerText = json.length;
+ })
}, 1000);
\ No newline at end of file
diff --git a/Website/media/queue.svg b/Website/media/queue.svg
new file mode 100644
index 0000000..30b9620
--- /dev/null
+++ b/Website/media/queue.svg
@@ -0,0 +1,7 @@
+
+
+
\ No newline at end of file
diff --git a/Website/media/running.svg b/Website/media/running.svg
new file mode 100644
index 0000000..ddde0a6
--- /dev/null
+++ b/Website/media/running.svg
@@ -0,0 +1,53 @@
+
+
+
+
\ No newline at end of file
diff --git a/Website/media/tasks.svg b/Website/media/tasks.svg
new file mode 100644
index 0000000..6e64e66
--- /dev/null
+++ b/Website/media/tasks.svg
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Website/style.css b/Website/style.css
index 4a9c3b1..d490a08 100644
--- a/Website/style.css
+++ b/Website/style.css
@@ -103,8 +103,29 @@ footer {
width: 100%;
height: 40px;
align-items: center;
- justify-content: space-evenly;
+ justify-content: center;
background-color: var(--primary-color);
+ align-content: center;
+}
+
+footer > div {
+ height: 100%;
+ margin: 0 30px;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ align-items: center;
+}
+
+footer > div > *{
+ height: 40%;
+ margin: 0 5px;
+}
+
+#madeWith {
+ flex-grow: 1;
+ text-align: right;
+ margin-right: 20px;
}
content {