goosebit 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

goosebit/ui/static/js/{firmware.js → software.js}

@@ -12,6 +12,9 @@ uploadForm.addEventListener("submit", async (e) => {
 });
 
 async function sendFileChunks(file) {
+    const alerts = document.getElementById("upload-alerts");
+    alerts.innerHTML = "";
+
     const totalChunks = Math.ceil(file.size / CHUNK_SIZE);
     let start = 0;
     let uploadedChunks = 0;
@@ -39,7 +42,7 @@ async function sendFileChunks(file) {
             formData.append("done", "false");
         }
 
-        const response = await fetch("/ui/upload/local", {
+        const response = await fetch("/ui/bff/software", {
             method: "POST",
             body: formData,
         });
@@ -50,9 +53,8 @@ async function sendFileChunks(file) {
             uploadProgressBar.style.width = `${progress}%`;
             uploadProgressBar.innerHTML = `${Math.round(progress)}%`;
         } else {
-            if (response.status === 400) {
+            if (response.status >= 400 && response.status < 500) {
                 const result = await response.json();
-                const alerts = document.getElementById("upload-alerts");
                 alerts.innerHTML = `<div class="alert alert-warning alert-dismissible fade show" role="alert">
                     ${result.detail}
                     <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -78,18 +80,26 @@ urlForm.addEventListener("submit", async (e) => {
 });
 
 async function sendFileUrl(url) {
+    const alerts = document.getElementById("url-alerts");
+    alerts.innerHTML = "";
+
     const formData = new FormData();
     formData.append("url", url);
 
-    const response = await fetch("/ui/upload/remote", {
+    const response = await fetch("/ui/bff/software", {
         method: "POST",
         body: formData,
     });
 
-    if (!response.ok) {
-        if (response.status === 400) {
+    if (response.ok) {
+        alerts.innerHTML = `<div class="alert alert-success alert-dismissible fade show" role="alert">
+            Software creation (or replacement) successful
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>`;
+        updateSoftwareList();
+    } else {
+        if (response.status >= 400 && response.status < 500) {
             const result = await response.json();
-            const alerts = document.getElementById("url-alerts");
             alerts.innerHTML = `<div class="alert alert-warning alert-dismissible fade show" role="alert">
                 ${result.detail}
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -98,7 +108,7 @@ async function sendFileUrl(url) {
     }
 }
 
-function updateFirmwareList() {
+function updateSoftwareList() {
     dataTable.ajax.reload(null, false);
 }
 
@@ -112,11 +122,52 @@ function resetProgress() {
     uploadProgressBar.innerHTML = "0%";
     uploadProgressBar.parentElement.classList.add("d-none");
 
-    updateFirmwareList();
+    updateSoftwareList();
 }
 
 document.addEventListener("DOMContentLoaded", () => {
-    dataTable = new DataTable("#firmware-table", {
+    const buttons = [
+        {
+            text: '<i class="bi bi-cloud-download" ></i>',
+            action: (e, dt) => {
+                const selectedSoftware = dt
+                    .rows({ selected: true })
+                    .data()
+                    .toArray()
+                    .map((d) => d.id);
+                downloadSoftware(selectedSoftware[0]);
+            },
+            className: "buttons-download",
+            titleAttr: "Download Software",
+        },
+        {
+            text: '<i class="bi bi-trash" ></i>',
+            action: async (e, dt) => {
+                const selectedSoftware = dt
+                    .rows({ selected: true })
+                    .data()
+                    .toArray()
+                    .map((d) => d.id);
+                await deleteSoftware(selectedSoftware);
+            },
+            className: "buttons-delete",
+            titleAttr: "Delete Software",
+        },
+    ];
+
+    // add create button at the beginning if upload modal exists
+    if ($("#upload-modal").length > 0) {
+        buttons.unshift({
+            text: '<i class="bi bi-plus" ></i>',
+            action: () => {
+                new bootstrap.Modal("#upload-modal").show();
+            },
+            className: "buttons-create",
+            titleAttr: "Add Software",
+        });
+    }
+
+    dataTable = new DataTable("#software-table", {
         responsive: true,
         paging: true,
         processing: false,
@@ -136,7 +187,7 @@ document.addEventListener("DOMContentLoaded", () => {
             }
         },
         ajax: {
-            url: "/api/firmware/all",
+            url: "/ui/bff/software",
             contentType: "application/json",
         },
         initComplete: () => {
@@ -152,8 +203,24 @@ document.addEventListener("DOMContentLoaded", () => {
         ],
         columns: [
             { data: "id", visible: false },
-            { data: "name", searchable: true },
+            { data: "name" },
             { data: "version", searchable: true, orderable: true },
+            {
+                data: "compatibility",
+                render: (data) => {
+                    const result = data.reduce((acc, { model, revision }) => {
+                        if (!acc[model]) {
+                            acc[model] = [];
+                        }
+                        acc[model].push(revision);
+                        return acc;
+                    }, {});
+
+                    return Object.entries(result)
+                        .map(([model, revision]) => `${model} - ${revision.join(", ")}`)
+                        .join("\n");
+                },
+            },
             {
                 data: "size",
                 render: (data, type) => {
@@ -168,34 +235,7 @@ document.addEventListener("DOMContentLoaded", () => {
         rowId: "id",
         layout: {
             bottom1Start: {
-                buttons: [
-                    {
-                        text: '<i class="bi bi-cloud-download" ></i>',
-                        action: (e, dt) => {
-                            const selectedFirmware = dt
-                                .rows({ selected: true })
-                                .data()
-                                .toArray()
-                                .map((d) => d.id);
-                            downloadFirmware(selectedFirmware[0]);
-                        },
-                        className: "buttons-download",
-                        titleAttr: "Download Firmware",
-                    },
-                    {
-                        text: '<i class="bi bi-trash" ></i>',
-                        action: async (e, dt) => {
-                            const selectedFirmware = dt
-                                .rows({ selected: true })
-                                .data()
-                                .toArray()
-                                .map((d) => d.id);
-                            await deleteFirmware(selectedFirmware);
-                        },
-                        className: "buttons-delete",
-                        titleAttr: "Delete Firmware",
-                    },
-                ],
+                buttons,
             },
         },
     });
@@ -208,46 +248,7 @@ document.addEventListener("DOMContentLoaded", () => {
             updateBtnState();
         });
 
-    // Compatibility tooltip
-    $(() => {
-        $('[data-toggle="tooltip"]').tooltip();
-    });
-
-    $("#firmware-table tbody")
-        .on("mouseenter", "tr", function () {
-            const rowData = dataTable.row(this).data();
-            const compat = rowData.compatibility;
-            let tooltipText = "";
-            if (compat) {
-                const result = compat.reduce((acc, { model, revision }) => {
-                    if (!acc[model]) {
-                        acc[model] = [];
-                    }
-                    acc[model].push(revision);
-                    return acc;
-                }, {});
-
-                tooltipText = Object.entries(result)
-                    .map(([model, revision]) => `<b>${model}</b> [${revision.join(", ")}]`)
-                    .join(", ");
-            }
-
-            // Initialize Bootstrap tooltip
-            $(this)
-                .attr("title", tooltipText)
-                .tooltip({
-                    placement: "top",
-                    trigger: "hover",
-                    container: "body",
-                    html: true,
-                })
-                .tooltip("show");
-        })
-        .on("mouseleave", "tr", function () {
-            $(this).tooltip("dispose");
-        });
-
-    updateFirmwareList();
+    updateSoftwareList();
 });
 
 function updateBtnState() {
@@ -263,15 +264,15 @@ function updateBtnState() {
     }
 }
 
-async function deleteFirmware(files) {
+async function deleteSoftware(software_ids) {
     try {
-        await post("/api/firmware/delete", files);
-        updateFirmwareList();
+        await delete_request("/ui/bff/software", { software_ids });
+        updateSoftwareList();
     } catch (error) {
-        console.error("Deleting firmwares failed:", error);
+        console.error("Deleting software list failed:", error);
     }
 }
 
-function downloadFirmware(file) {
-    window.location.href = `/api/download/${file}`;
+function downloadSoftware(file) {
+    window.location.href = `/ui/bff/download/${file}`;
 }

goosebit/ui/static/js/util.js

@@ -20,15 +20,15 @@ function secondsToRecentDate(t) {
     return s + (s === 1 ? " second" : " seconds");
 }
 
-async function updateFirmwareSelection(addSpecialMode = false) {
+async function updateSoftwareSelection(addSpecialMode = false) {
     try {
-        const response = await fetch("/api/firmware/all");
+        const response = await fetch("/ui/bff/software");
         if (!response.ok) {
-            console.error("Retrieving firmwares failed.");
+            console.error("Retrieving software list failed.");
             return;
         }
         const data = (await response.json()).data;
-        const selectElem = document.getElementById("selected-fw");
+        const selectElem = document.getElementById("selected-sw");
 
         if (addSpecialMode) {
             let optionElem = document.createElement("option");
@@ -45,7 +45,9 @@ async function updateFirmwareSelection(addSpecialMode = false) {
         for (const item of data) {
             const optionElem = document.createElement("option");
             optionElem.value = item.id;
-            optionElem.textContent = item.name;
+            optionElem.textContent = `${item.version}`;
+            const models = [...new Set(item.compatibility.map((item) => item.model))];
+            optionElem.textContent = `${item.version} (${models})`;
             selectElem.appendChild(optionElem);
         }
     } catch (error) {
@@ -53,7 +55,7 @@ async function updateFirmwareSelection(addSpecialMode = false) {
     }
 }
 
-async function post(url, object) {
+async function post_request(url, object) {
     const response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -61,6 +63,58 @@ async function post(url, object) {
     });
 
     if (!response.ok) {
+        const result = await response.json();
+        if (result.detail) {
+            Swal.fire({
+                title: "Warning",
+                text: result.detail,
+                icon: "warning",
+                confirmButtonText: "Understood",
+            });
+        }
+
+        throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
+    }
+}
+async function patch_request(url, object) {
+    const response = await fetch(url, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(object),
+    });
+
+    if (!response.ok) {
+        const result = await response.json();
+        if (result.detail) {
+            Swal.fire({
+                title: "Warning",
+                text: result.detail,
+                icon: "warning",
+                confirmButtonText: "Understood",
+            });
+        }
+
+        throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
+    }
+}
+async function delete_request(url, object) {
+    const response = await fetch(url, {
+        method: "DELETE",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(object),
+    });
+
+    if (!response.ok) {
+        const result = await response.json();
+        if (result.detail) {
+            Swal.fire({
+                title: "Warning",
+                text: result.detail,
+                icon: "warning",
+                confirmButtonText: "Understood",
+            });
+        }
+
         throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
     }
 }

goosebit/ui/static/svg/goosebit-logo.svg

@@ -1 +1 @@
-<svg width="160mm" height="160mm" version="1.1" viewBox="0 0 160 160" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-32.316 -71.486)"><g transform="translate(3.1433 .77798)" stroke="#000"><path d="m112.72 77.662a3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 0.89762 2.1699v13.542h-43.886c-7.6869 0-14.133 5.0881-16.192 12.091h-12.416a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.731c-0.0039 0.15084-0.02274 0.29776-0.02274 0.44958v7.3003h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.708v7.7499h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.708v7.7499h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.708v7.7499h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.708v7.7499h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89761h11.708v7.7494h-11.719a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h11.708v7.3008c0 0.1517 0.0188 0.29835 0.02274 0.44907h-11.742a3.072 3.072 0 0 0-2.159-0.89762 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 2.1699-0.89762h12.405c1.6399 5.5765 6.0655 9.9236 11.683 11.468v15.152a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.527c0.05398 5e-4 0.10609 8e-3 0.1602 8e-3h7.5897v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.7494v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.7499v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.7499v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.7499v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.7499v14.529a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-14.518h7.5892c0.0543 0 0.10656-8e-3 0.16071-8e-3v14.538a3.072 3.072 0 0 0-0.89762 2.159 3.072 3.072 0 0 0 3.0722 3.0722 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-0.89762-2.1699v-15.141c5.6174-1.5445 10.043-5.8916 11.682-11.468h12.992a3.072 3.072 0 0 0 2.159 0.89762 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-2.1699 0.89762h-12.307c4e-3 -0.15072 0.0227-0.29737 0.0227-0.44907v-7.3008h12.295a3.072 3.072 0 0 0 2.159 0.89762 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-2.1699 0.89762h-12.284v-7.7494h12.295a3.072 3.072 0 0 0 2.159 0.89761 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-2.1699 0.89762h-12.284v-7.7499h12.295a3.072 3.072 0 0 0 2.159 0.89762 3.072 3.072 0 0 0 3.0722-3.0722 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-2.1699 0.89762h-12.284v-43.597c0-7.791-5.2299-14.3-12.38-16.266v-14.176a3.072 3.072 0 0 0 0.89762-2.159 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 0.89762 2.1699v13.551c-0.0542-5.05e-4 -0.10644-0.0083-0.16071-0.0083h-7.5892v-13.553a3.072 3.072 0 0 0 0.89762-2.159 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 0.89762 2.1699v13.542h-7.7499v-13.553a3.072 3.072 0 0 0 0.89762-2.159 3.072 3.072 0 0 0-3.0722-3.0722 3.072 3.072 0 0 0-3.0722 3.0722 3.072 3.072 0 0 0 0.89762 2.1699v13.542h-7.7499v-13.553a3.072 3.072 0 0 0 0.89762-2.159 3.072 3.072 0 0 0-3.0722-3.0722z" fill="#fff"/><g><path d="m83.315 71.988c-7.7785-0.10611-12.693 4.0778-12.693 4.0778s-4.8045 3.244-6.8197 5.6885c-2.0152 2.4446-3.9998 3.3161-3.9998 3.3161l-10.92 4.4292s-4.3039 2.004-4.6829 6.8874c-0.37903 4.8834 8.6052 6.8151 8.6052 6.8151l10.779 1.2867c-3.797 2.1848-6.349 6.2714-6.349 10.984v74.649c0 7.0224 5.6533 12.676 12.676 12.676h74.649c7.0224 0 12.676-5.6533 12.676-12.676v-28.141c19.08-22.042 22.782-33.839 22.782-33.839s2.3205-7.1538 4.8922-15.174c2.5717-8.0199-3.6974-6.8585-3.6974-6.8585l-24.252 6.7293c-1.207-5.7485-6.2825-10.041-12.4-10.041h-33.177c-1.9266-19.83-13.78-25.894-13.78-25.894-5.3521-3.6273-10.213-4.8599-14.287-4.9155z" fill="#121e2c"/><path d="m69.443 107.99c-3.9647 0-7.1567 3.1915-7.1567 7.1562v40.219c0.96019-8.4807 4.4328-18.052 9.6733-24.824 9.8714-12.755 9.3931-19.262 5.7521-22.552zm42.644 0c0.24496 10.488-4.3418 20.083-4.3418 20.083l44.46-13.835c-0.44487-3.5314-3.4372-6.2477-7.0931-6.2477zm-49.801 61.069v21.844c0 3.9647 3.192 7.1562 7.1567 7.1562h18.112c-8.3075-3.693-21.415-12.054-25.268-29z" fill="#29befe"/><path d="m178.96 112.14-69.703 20.837s-18.894 12.226-6.2239 35.914c0.31428-4e-3 39.979 0.0384 39.979 0.0384s5.3864-3.9688 9.3648-9.8406l-40.695-0.25269s-2.0754 0.0793-2.0075-2.3201c0.068-2.3994 1.2177-2.4825 1.2177-2.4825l44.832 0.25605s3.3352-2.6554 8.4851-11.307l-46.34-0.0399s-1.8324-0.34051-1.7768-2.6268c0.0556-2.2863 2.6305-2.585 2.6305-2.585l45.957-0.17048s2.2148 0.37311 4.94-2.6224c2.7252-2.9954 9.801-21.321 9.801-21.321s0.63122-1.6448-0.46214-1.4781zm-72.26 60.929 33.354-0.22045s-4.43 6.7245-14.346 7.0264c-14.503 0.44144-19.008-6.8059-19.008-6.8059zm-39.296-87.393 7.3033 15.24s22.892 2.1374 4.4586 29.071c-18.433 26.934-7.9015 44.329-7.9015 44.329s10.309 21.075 36.028 23.294l35.722 0.45927s7.6669 5e-3 8.9801-7.2795l-0.0255-22.663s-10.703 16.455-23.723 17.408c-9.6849 0.70923-14.934-1.1038-17.672-2.5611-2.2513-1.1981-30.046-14.686-11.338-50.201 16.735-31.77-0.73572-47.166-0.73572-47.166l-13.986 3.0599s0.67535 2.9676-1.8951 4.436c-1.9916 1.1377-5.4854 0.11131-6.6183-1.8831-1.1522-2.0285-0.22903-5.5118 1.8024-6.7625 2.7445-1.6898 5.1812-0.15486 5.1812-0.15486l12.185-2.4294s-15.541-10.99-27.765 3.8033zm2.126 14.889s-16.877-2.0953-19.634-2.9542c-2.7568-0.85892-0.37994-2.5393-0.37994-2.5393s10.175-2.8442 14.302-6.5923z" fill="#fff"/></g></g></g></svg>
+<svg width="160mm" height="160mm" version="1.1" viewBox="0 0 160 160" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g stroke="#000"><path d="m71.456 6.9438c-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722 5e-5 0.81363 0.32287 1.594 0.89762 2.1699v13.554l-31.794-0.00155c-0.053963 0-0.10636 0.006217-0.1602 0.006718v-13.557c0.57209-0.57322 0.89469-1.3492 0.89762-2.159 1.1e-4 -1.6968-1.3759-3.0723-3.0727-3.0722-1.6968-1.11e-4 -3.0728 1.3754-3.0727 3.0722 5e-5 0.81363 0.32287 1.594 0.89762 2.1699v14.156c-5.6155 1.5454-10.042 5.898-11.682 11.475h-12.416c-0.57321-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722-1.105e-4 1.6968 1.3754 3.0723 3.0722 3.0722 0.81363-4.8e-5 1.594-0.32287 2.1699-0.89762h11.731c-0.0039 0.15084-0.022737 0.29776-0.022737 0.44958v7.3003h-11.719c-0.57321-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722-1.105e-4 1.6968 1.3754 3.0728 3.0722 3.0727 0.81363-4.8e-5 1.594-0.32287 2.1699-0.89762h11.708v7.7499h-11.719c-0.57321-0.57209-1.3487-0.89469-2.1585-0.89762-1.6968-1.1e-4 -3.0728 1.3754-3.0727 3.0722-1.105e-4 1.6968 1.3759 3.0723 3.0727 3.0722 0.81363-4.8e-5 1.594-0.32287 2.1699-0.89762h11.708v7.7499h-11.719c-0.57321-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722-1.105e-4 1.6968 1.3754 3.0723 3.0722 3.0722 0.81363-4.8e-5 1.594-0.32287 2.1699-0.89762h11.708v7.7499h-11.719c-0.57321-0.57209-1.3487-0.89469-2.1585-0.89762-1.6968-1.1e-4 -3.0728 1.3754-3.0727 3.0722-1.105e-4 1.6968 1.3759 3.0723 3.0727 3.0722 0.81363-4.8e-5 1.594-0.32287 2.1699-0.89762h11.708v7.7499h-11.719c-0.57321-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722-1.105e-4 1.6968 1.3754 3.0723 3.0722 3.0722 0.81363-5e-5 1.594-0.32287 2.1699-0.89762h11.708v7.7494h-11.719c-0.57321-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722-1.105e-4 1.6968 1.3754 3.0728 3.0722 3.0727 0.81363-5e-5 1.594-0.32287 2.1699-0.89762h11.708v7.3003c0 0.1517 0.018798 0.29835 0.022738 0.44907h-11.742c-0.57322-0.57209-1.3492-0.89469-2.159-0.89762-1.6968-1.1e-4 -3.0723 1.3759-3.0722 3.0727-1.105e-4 1.6968 1.3754 3.0723 3.0722 3.0722 0.81363-5e-5 1.594-0.32287 2.1699-0.89762h12.405c1.6399 5.5765 6.0655 9.9236 11.683 11.468v15.152c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81362-0.32287-1.594-0.89762-2.1699v-14.527c0.05398 5e-4 0.10609 0.00827 0.1602 0.00827h7.5897v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.7494v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3759 3.0723 3.0727 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.7499v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.7499v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.7499v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-4.8e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.7499v14.529c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-5e-5 -0.81363-0.32287-1.594-0.89762-2.1699v-14.518h7.5892c0.0543 0 0.10656-0.00775 0.16071-0.00775v14.538c-0.57209 0.57322-0.89469 1.3492-0.89762 2.159-1.1e-4 1.6968 1.3754 3.0723 3.0722 3.0722 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722-5e-5 -0.81362-0.32287-1.594-0.89762-2.1699v-15.141c5.6174-1.5445 10.043-5.8916 11.682-11.468h12.992c0.57322 0.57209 1.3492 0.89469 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 5e-5 -1.5945 0.32287-2.1704 0.89762h-12.307c4e-3 -0.15072 0.02274-0.29737 0.02274-0.44907v-7.3008h12.295c0.57321 0.57209 1.3492 0.89469 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 5e-5 -1.594 0.32287-2.1699 0.89762h-12.284v-7.7494h12.295c0.57321 0.57209 1.3492 0.8947 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3759 3.0722-3.0727 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 4.8e-5 -1.594 0.32287-2.1699 0.89762h-12.284v-7.7499h12.295c0.57322 0.57209 1.3492 0.89469 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 4.8e-5 -1.5945 0.32287-2.1704 0.89762h-12.283v-7.753h12.295c0.57321 0.5721 1.3492 0.8947 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3759 3.0722-3.0727 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 5e-5 -1.594 0.32287-2.1699 0.89762h-12.284v-7.7499h12.295c0.57321 0.5721 1.3492 0.8947 2.159 0.89762 1.6968 1.1e-4 3.0723-1.3754 3.0722-3.0722 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.81363 5e-5 -1.594 0.32287-2.1699 0.89762h-12.284v-19.396c0-0.15199-0.01517-0.30015-0.01913-0.45114h12.303c0.5759 0.57475 1.3563 0.89757 2.1699 0.89762 1.6968 1e-4 3.0723-1.3759 3.0722-3.0727 1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-0.8098 0.00293-1.5858 0.32553-2.159 0.89762h-12.997c-1.6432-5.5691-6.0616-9.9213-11.677-11.465v-14.176c0.57208-0.57321 0.89469-1.3487 0.89762-2.1585 1.1e-4 -1.6968-1.3754-3.0728-3.0722-3.0727-1.6968-1.105e-4 -3.0723 1.3759-3.0722 3.0727 5e-5 0.81363 0.32287 1.594 0.89762 2.1699v13.551c-0.0542-5.05e-4 -0.10644-0.008785-0.16071-0.008785h-7.5892v-13.553c0.57209-0.57322 0.89469-1.3492 0.89762-2.159 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722-1.6968-1.105e-4 -3.0723 1.3754-3.0722 3.0722 5e-5 0.81363 0.32287 1.594 0.89762 2.1699v13.542h-7.7499v-13.553c0.57209-0.57322 0.89469-1.3487 0.89762-2.1585 1.1e-4 -1.6968-1.3754-3.0728-3.0722-3.0727-1.6968-1.105e-4 -3.0723 1.3759-3.0722 3.0727 4.8e-5 0.81363 0.32287 1.594 0.89762 2.1699v13.542l-7.7411-5.17e-4v-13.565c0.5721-0.57321 0.8947-1.3492 0.89762-2.159 1.1e-4 -1.6968-1.3759-3.0723-3.0727-3.0722-1.6968-1.1e-4 -3.0723 1.3754-3.0722 3.0722 5e-5 0.81363 0.32287 1.594 0.89762 2.1699v13.554l-7.7499-5.16e-4v-13.565c0.5721-0.57321 0.8947-1.3492 0.89762-2.159 1.1e-4 -1.6968-1.3754-3.0723-3.0722-3.0722l-0.00155-5.168e-4z" fill="#fff"/><path d="m54.142 1.28c-7.7785-0.10611-12.693 4.0778-12.693 4.0778s-4.8045 3.244-6.8197 5.6885c-2.0152 2.4446-3.9998 3.3161-3.9998 3.3161l-10.92 4.4292s-4.3039 2.004-4.6829 6.8874c-0.37903 4.8834 8.6052 6.8151 8.6052 6.8151l10.779 1.2867c-3.797 2.1848-6.349 6.2714-6.349 10.984v74.649c0 7.0224 5.6533 12.676 12.676 12.676h74.649c7.0224 0 12.676-5.6533 12.676-12.676v-28.141c19.08-22.042 22.782-33.839 22.782-33.839s2.3205-7.1538 4.8922-15.174c2.5717-8.0199-3.6974-6.8585-3.6974-6.8585l-24.252 6.7293c-1.207-5.7485-6.2825-10.041-12.4-10.041h-33.177c-1.9266-19.83-13.78-25.894-13.78-25.894-5.3521-3.6273-10.213-4.8599-14.287-4.9155z" fill="#121e2c"/><path d="m40.27 37.282c-3.9647 0-7.1567 3.1915-7.1567 7.1562v40.219c0.96019-8.4807 4.4328-18.052 9.6733-24.824 9.8714-12.755 9.3931-19.262 5.7521-22.552zm42.644 0c0.24496 10.488-4.3418 20.083-4.3418 20.083l44.46-13.835c-0.44487-3.5314-3.4372-6.2477-7.0931-6.2477zm-49.801 61.069v21.844c0 3.9647 3.192 7.1562 7.1567 7.1562h18.112c-8.3075-3.693-21.415-12.054-25.268-29z" fill="#29befe"/><path d="m149.79 41.432-69.703 20.837s-18.894 12.226-6.2239 35.914c0.31428-4e-3 39.979 0.0384 39.979 0.0384s5.3864-3.9688 9.3648-9.8406l-40.695-0.25269s-2.0754 0.0793-2.0075-2.3201c0.068-2.3994 1.2177-2.4825 1.2177-2.4825l44.832 0.25605s3.3352-2.6554 8.4851-11.307l-46.34-0.0399s-1.8324-0.34051-1.7768-2.6268c0.0556-2.2863 2.6305-2.585 2.6305-2.585l45.957-0.17048s2.2148 0.37311 4.94-2.6224c2.7252-2.9954 9.801-21.321 9.801-21.321s0.63122-1.6448-0.46214-1.4781zm-72.26 60.929 33.354-0.22045s-4.43 6.7245-14.346 7.0264c-14.503 0.44144-19.008-6.8059-19.008-6.8059zm-39.296-87.393 7.3033 15.24s22.892 2.1374 4.4586 29.071c-18.433 26.934-7.9015 44.329-7.9015 44.329s10.309 21.075 36.028 23.294l35.722 0.45927s7.6669 5e-3 8.9801-7.2795l-0.0255-22.663s-10.703 16.455-23.723 17.408c-9.6849 0.70923-14.934-1.1038-17.672-2.5611-2.2513-1.1981-30.046-14.686-11.338-50.201 16.735-31.77-0.73572-47.166-0.73572-47.166l-13.986 3.0599s0.67535 2.9676-1.8951 4.436c-1.9916 1.1377-5.4854 0.11131-6.6183-1.8831-1.1522-2.0285-0.22903-5.5118 1.8024-6.7625 2.7445-1.6898 5.1812-0.15486 5.1812-0.15486l12.185-2.4294s-15.541-10.99-27.765 3.8033zm2.126 14.889s-16.877-2.0953-19.634-2.9542c-2.7568-0.85892-0.37994-2.5393-0.37994-2.5393s10.175-2.8442 14.302-6.5923z" fill="#fff"/></g></svg>

goosebit/ui/templates/__init__.py

@@ -1,5 +1,13 @@
 from pathlib import Path
 
+from fastapi.requests import Request
 from fastapi.templating import Jinja2Templates
 
-templates = Jinja2Templates(str(Path(__file__).resolve().parent))
+from goosebit.auth import check_permissions
+
+
+def attach_permissions_comparison(_: Request):
+    return {"compare_permissions": check_permissions}
+
+
+templates = Jinja2Templates(str(Path(__file__).resolve().parent), context_processors=[attach_permissions_comparison])

goosebit/ui/templates/devices.html.jinja

@@ -0,0 +1,75 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <div class="container-fluid">
+        <div class="row p-2 d-flex justify-content-center">
+            <div class="col">
+                <table id="device-table" class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>Up</th>
+                            <th>UUID</th>
+                            <th>Name</th>
+                            <th>Model</th>
+                            <th>Revision</th>
+                            <th>Feed</th>
+                            <th>Installed Software</th>
+                            <th>Target Software</th>
+                            <th>Update Mode</th>
+                            <th>State</th>
+                            <th>Force Update</th>
+                            <th>Progress</th>
+                            <th>Last IP</th>
+                            <th>Last Seen</th>
+                        </tr>
+                    </thead>
+                    <tbody id="devices-list">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal" id="device-config-modal">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Configure Devices</h5>
+                    <button type="button"
+                            class="btn-close"
+                            data-bs-dismiss="modal"
+                            aria-label="Close"></button>
+                </div>
+                <form id="device-config-form" class="needs-validation" novalidate>
+                    <div class="modal-body">
+                        <div class="form-group mb-3">
+                            <label for="device-selected-name">Name</label>
+                            <input id="device-selected-name" class="form-control" placeholder="Name" />
+                        </div>
+                        <div class="form-group mb-3">
+                            <label for="device-selected-feed">Feed</label>
+                            <input id="device-selected-feed"
+                                   class="form-control"
+                                   placeholder="Feed"
+                                   required />
+                            <div class="invalid-feedback">
+                                Feed missing. Use "default" if working with a single
+                                feed.
+                            </div>
+                        </div>
+                        <div class="form-group mb-3">
+                            <label for="selected-sw">Update Mode</label>
+                            <select class="form-select" id="selected-sw" required>
+                                <option value="" disabled selected>Select software</option>
+                            </select>
+                            <div class="invalid-feedback">Mode missing.</div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                        <button type="submit" class="btn btn-outline-light">Save changes</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="{{ url_for('static', path='js/devices.js') }}"></script>
+{% endblock content %}

goosebit/ui/templates/index.html.jinja

@@ -0,0 +1,25 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <div class="container-fluid">
+        <div class="row p-2 d-flex justify-content-center">
+            <div class="col">
+                <table id="device-table" class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Up</th>
+                            <th>UUID</th>
+                            <th>Software</th>
+                            <th>Progress</th>
+                            <th>Last IP</th>
+                            <th>Last Seen</th>
+                        </tr>
+                    </thead>
+                    <tbody id="devices-list">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <script src="{{ url_for('static', path='js/index.js') }}"></script>
+{% endblock content %}

goosebit/ui/templates/login.html.jinja

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>Login</title>
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
+              rel="stylesheet"
+              integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+              crossorigin="anonymous" />
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
+                integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+                crossorigin="anonymous"></script>
+        <link rel="stylesheet"
+              href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" />
+        <link rel="icon" href="{{ url_for('static', path='favicon.svg') }}" />
+    </head>
+    <body data-bs-theme="dark">
+        <div class="container py-2">
+            <div class="row d-flex justify-content-center align-items-center h-100">
+                <div class="col-12 col-md-8 col-lg-6 col-xl-5">
+                    <div class="mb-md-5 mt-md-4 pb-5">
+                        <div class="row mb-2 p-2">
+                            <div class="col d-flex align-items-center">
+                                <h2 class="fw-bold m-0 text-uppercase">gooseBit</h2>
+                            </div>
+                            <div class="col d-flex justify-content-end px-3">
+                                <img src="{{ request.url_for('static', path='svg/goosebit-logo.svg') }}"
+                                     height="35px"
+                                     width="35px"
+                                     alt="gooseBit Logo" />
+                            </div>
+                        </div>
+                        <form method="post" id="login_form">
+                            <div class="form-outline form-white mb-4">
+                                <input type="email"
+                                       id="username"
+                                       name="username"
+                                       placeholder="Email"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <div class="form-outline form-white mb-4">
+                                <input type="password"
+                                       id="password"
+                                       name="password"
+                                       placeholder="Password"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <button class="btn btn-outline-light btn-lg px-5 w-100" type="submit">Login</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script src="{{ url_for('static', path='js/login.js') }}"></script>
+    </body>
+</html>

goosebit/ui/templates/logs.html.jinja

@@ -0,0 +1,31 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <div class="container-fluid">
+        <div class="row p-2 d-flex justify-content-center">
+            <div class="col col-12 col-lg-9">
+                <div class="card border rounded">
+                    <div class="card-header">
+                        <h3>Logs - {{ device }}</h3>
+                    </div>
+                    <div class="card-header">
+                        <div class="progress m-2"
+                             role="progressbar"
+                             aria-label="Basic example"
+                             aria-valuenow="0"
+                             aria-valuemin="0"
+                             aria-valuemax="100">
+                            <div class="progress-bar progress-bar-striped progress-bar-animated"
+                                 id="install-progress"
+                                 style="width: 0%"></div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <pre id="device-log"></pre>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>device = "{{ device }}";</script>
+    <script src="{{ url_for('static', path='js/logs.js') }}"></script>
+{% endblock content %}