Tranga-API/Program.cs

@@ -79,16 +79,7 @@ app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string?
     taskManager.DeleteTask(task, connectorName, publication);
 });
 
-app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? searchString) =>
+app.MapGet("/Tasks/GetList", () => taskManager.GetAllTasks());
-{
-    TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
-    if (searchString is null)
-        return taskManager.GetAllTasks().Where(tTask => tTask.task == task && tTask.connectorName == connectorName);
-    else
-        return taskManager.GetAllTasks().Where(tTask =>
-            tTask.task == task && tTask.connectorName == connectorName && tTask.ToString()
-                .Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
-});
 
 app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? publicationId) =>
 {

Website/apiConnector.js

@@ -52,8 +52,8 @@ async function GetRunningTasks(){
     return json;
 }
 
-async function GetDownloadTasks(){
+async function GetTasks(){
-    var uri = apiUri + "/Tasks/Get?taskType=DownloadNewChapters";
+    var uri = apiUri + "/Tasks/GetList";
     let json = await GetData(uri);
     return json;
 }
@@ -64,12 +64,6 @@ async function GetSettings(){
     return json;
 }
 
-async function GetKomgaTask(){
-    var uri = apiUri + "/Tasks/Get?taskType=UpdateKomgaLibrary";
-    let json = await GetData(uri);
-    return json;
-}
-
 function CreateTask(taskType, reoccurrence, connectorName, publicationId, language){
     var uri = apiUri + `/Tasks/Create?taskType=${taskType}&connectorName=${connectorName}&publicationId=${publicationId}&reoccurrenceTime=${reoccurrence}&language=${language}`;
     PostData(uri);
@@ -86,7 +80,7 @@ function EnqueueTask(taskType, connectorName, publicationId){
 }
 
 function UpdateSettings(downloadLocation, komgaUrl, komgaAuth){
-    var uri = apiUri + `/Settings/Update?downloadLocation=${downloadLocation}&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
+    var uri = apiUri + `/Settings/Update?downloadLocation=${downloadLocation}&komgaUrl=${komgaAuth}&komgaAuth=${komgaAuth}`;
     PostData(uri);
 }
 

Website/index.html

@@ -80,16 +80,13 @@
   </viewport>
   
   <settingstab id="settingstab">
-    <span class="title">Download Location:</span>
+    <p>Download Location: <span id="downloadLocation"></span></p>
-    <span id="downloadLocation"></span>
     <komga-settings>
-      <span class="title">Komga</span>
-      <div>Configured: <span id="komgaConfigured">✅❌</span></div>
       <label for="komgaUrl"></label><input placeholder="URL" id="komgaUrl" type="text">
       <label for="komgaUsername"></label><input placeholder="Username" id="komgaUsername" type="text">
       <label for="komgaPassword"></label><input placeholder="Password" id="komgaPassword" type="password">
-      <div><label for="komgaUpdateTime" style="margin-right: 5px;">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01"></div>
+      <label for="komgaUpdateTime">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01">
-      <input type="submit" value="Update" onclick="UpdateSettingsClick()">
+      <input type="submit" value="Update" onclick="UpdateSettingsClick()">;
     </komga-settings>
   </settingstab>
   

Website/interaction.js

@@ -40,14 +40,13 @@ const publicationDelete = document.querySelector("publication-delete");
 const publicationAdd = document.querySelector("publication-add");
 const closetaskpopup = document.querySelector("#closePopupImg");
 const settingDownloadLocation = document.querySelector("#downloadLocation");
-const settingKomgaUrl = document.querySelector("#komgaUrl");
+const settingKomgaUrl = document.querySelector("#komgaURL");
 const settingKomgaUser = document.querySelector("#komgaUsername");
 const settingKomgaPass = document.querySelector("#komgaPassword");
 const settingKomgaTime = document.querySelector("#komgaUpdateTime");
-const settingKomgaConfigured = document.querySelector("#komgaConfigured");
 
 
-settingsCog.addEventListener("click", () => OpenSettings());
+settingsCog.addEventListener("click", () => slide());
 closetaskpopup.addEventListener("click", () => HideAddTaskPopup());
 document.querySelector("#blurBackgroundTaskPopup").addEventListener("click", () => HideAddTaskPopup());
 document.querySelector("#blurBackgroundPublicationPopup").addEventListener("click", () => HidePublicationPopup());
@@ -204,47 +203,20 @@ const fadeInTiming = {
     fill: "forwards"
 }
 
-function OpenSettings(){
-    GetSettingsClick();
-    slide();
-}
-
 function GetSettingsClick(){
-    settingKomgaUrl.value = "";
-    settingKomgaUser.value = "";
-    settingKomgaPass.value = "";
     
-    GetSettings().then(json => {
-        console.log(json);
-        settingDownloadLocation.innerText = json.downloadLocation;
-        if(json.komga != null)
-            settingKomgaUrl.placeholder = json.komga.baseUrl;
-    });
-    
-    GetKomgaTask().then(json => {
-        if(json.length > 0)
-            settingKomgaConfigured.innerText = "✅";
-        else
-            settingKomgaConfigured.innerText = "❌";
-    });
 }
 
 function UpdateSettingsClick(){
-    var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
+    var auth = atob(`${settingKomgaUser.value}:${settingKomgaPass.value}`)
-    console.log(auth);
+    UpdateSettings(settingDownloadLocation.value, settingKomgaUrl.value, auth);
-    UpdateSettings("", settingKomgaUrl.value, auth);
     CreateTask("UpdateKomgaLibrary", settingKomgaTime.value, "","","");
-    setTimeout(() => GetSettingsClick(), 500);
-}
-
-function utf8_to_b64( str ) {
-    return window.btoa(unescape(encodeURIComponent( str )));
 }
 
 //Resets the tasks shown
 ResetContent();
 //Get Tasks and show them
-GetDownloadTasks()
+GetTasks()
     .then(json => json.forEach(task => {
         var publication = CreatePublication(task.publication, task.connectorName);
         publication.addEventListener("click", (event) => ShowPublicationViewerWindow(task.publication.internalId, event, false));
@@ -255,7 +227,7 @@ GetDownloadTasks()
 setInterval(() => {
     //Tasks from API
     var cTasks = [];
-    GetDownloadTasks()
+    GetTasks()
         .then(json => json.forEach(task => cTasks.push(task)))
         .then(() => {
             //Only update view if tasks-amount has changed

Website/style.css

@@ -123,36 +123,6 @@ settingstab{
     height: calc(100% - var(--topbar-height) - 40px);
     margin-bottom: 10px;
     border-radius: 5px 0 0 5px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-}
-
-settingstab > * {
-    margin: 0 20px;
-}
-
-settingstab .title {
-    font-size: 14pt;
-    font-weight: bolder;
-    margin-top: 20px;
-}
-
-komga-settings {
-    margin-top: 20px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-}
-
-komga-settings > * {
-    margin: 2px 0;
-}
-
-komga-settings input {
-    padding: 3px;
-    border-radius: 3px;
-    border: 0;
 }
 
 #addPublication {