Merge pull request #6 from bakkot/patch-1

change "Tube Archivist IP" to "Tube Archivist URL"
This commit is contained in:
Simon 2022-11-28 11:49:39 +07:00 committed by GitHub
commit d7339d4998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions

View File

@ -16,7 +16,7 @@ function getBrowser() {
return chrome; return chrome;
} }
} else { } else {
console.log("failed to dedect browser"); console.log("failed to detect browser");
throw "browser detection error" throw "browser detection error"
}; };
} }

View File

@ -18,10 +18,8 @@
</div> </div>
<hr> <hr>
<form class="login-form"> <form class="login-form">
<label for="url">Tube Archivist IP:</label> <label for="full-url">Tube Archivist URL:</label>
<input type="text" id="url" name="url"> <input type="text" id="full-url" name="url">
<label for="port">Tube Archivist Port:</label>
<input type="text" id="port" name="port">
<label for="api-key">Tube Archivist API Key:</label> <label for="api-key">Tube Archivist API Key:</label>
<input type="password" id="api-key" name="api-key"> <input type="password" id="api-key" name="api-key">
</form> </form>

View File

@ -21,10 +21,15 @@ function getBrowser() {
// store access details // store access details
document.getElementById("save-login").addEventListener("click", function () { document.getElementById("save-login").addEventListener("click", function () {
let url = document.getElementById("full-url").value;
if (!url.includes('://')) {
url = 'http://' + url;
}
let parsed = new URL(url);
let toStore = { let toStore = {
"access": { "access": {
"url": document.getElementById("url").value, "url": `${parsed.protocol}//${parsed.hostname}`,
"port": document.getElementById("port").value, "port": parsed.port || (parsed.protocol === 'https' ? '443' : '80'),
"apiKey": document.getElementById("api-key").value "apiKey": document.getElementById("api-key").value
} }
}; };
@ -86,7 +91,7 @@ function pingBackend() {
console.log("connection validated") console.log("connection validated")
} }
} }
function handleError(error) { function handleError(error) {
console.log(`Error: ${error}`); console.log(`Error: ${error}`);
setStatusIcon(false); setStatusIcon(false);
@ -150,8 +155,12 @@ document.addEventListener("DOMContentLoaded", async () => {
setStatusIcon(false); setStatusIcon(false);
return return
} }
document.getElementById("url").value = item.access.url; let { url, port } = item.access;
document.getElementById("port").value = item.access.port; let fullUrl = url;
if (!(url.startsWith('http://') && port === '80')) {
fullUrl += `:${port}`;
}
document.getElementById("full-url").value = fullUrl;
document.getElementById("api-key").value = item.access.apiKey; document.getElementById("api-key").value = item.access.apiKey;
pingBackend(); pingBackend();
addUrl(item.access); addUrl(item.access);
@ -166,7 +175,7 @@ document.addEventListener("DOMContentLoaded", async () => {
setCookieState(); setCookieState();
} }
function onError(error) { function onError(error) {
console.log(`Error: ${error}`); console.log(`Error: ${error}`);
}; };