goosebit 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

goosebit/ui/static/js/util.js

@@ -22,10 +22,10 @@ function secondsToRecentDate(t) {
 
 async function updateSoftwareSelection(devices = null) {
     try {
-        const url = new URL("/ui/bff/software", window.location.origin);
+        const url = new URL("/ui/bff/software?order[0][dir]=desc&order[0][name]=version", window.location.origin);
         if (devices != null) {
             for (const device of devices) {
-                url.searchParams.append("uuids", device.uuid);
+                url.searchParams.append("ids", device.id);
             }
         }
         const response = await fetch(url.toString());
@@ -64,6 +64,26 @@ async function updateSoftwareSelection(devices = null) {
     }
 }
 
+async function get_request(url) {
+    const response = await fetch(url, {
+        method: "GET",
+    });
+
+    const result = await response.json();
+    if (!response.ok) {
+        if (result.detail) {
+            Swal.fire({
+                title: "Warning",
+                text: result.detail,
+                icon: "warning",
+                confirmButtonText: "Understood",
+            });
+        }
+
+        throw new Error(`GET ${url} failed for ${JSON.stringify(object)}`);
+    }
+    return result;
+}
 async function post_request(url, object) {
     const response = await fetch(url, {
         method: "POST",
@@ -85,6 +105,27 @@ async function post_request(url, object) {
         throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
     }
 }
+async function put_request(url, object) {
+    const response = await fetch(url, {
+        method: "PUT",
+        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(`PUT ${url} failed for ${JSON.stringify(object)}`);
+    }
+}
 async function patch_request(url, object) {
     const response = await fetch(url, {
         method: "PATCH",
@@ -103,7 +144,7 @@ async function patch_request(url, object) {
             });
         }
 
-        throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
+        throw new Error(`PATCH ${url} failed for ${JSON.stringify(object)}`);
     }
 }
 async function delete_request(url, object) {
@@ -124,6 +165,6 @@ async function delete_request(url, object) {
             });
         }
 
-        throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
+        throw new Error(`DELETE ${url} failed for ${JSON.stringify(object)}`);
     }
 }

goosebit/ui/templates/__init__.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+import jinja2
 from fastapi.requests import Request
 from fastapi.templating import Jinja2Templates
 
@@ -10,4 +11,12 @@ def attach_permissions_comparison(_: Request):
     return {"compare_permissions": check_permissions}
 
 
-templates = Jinja2Templates(str(Path(__file__).resolve().parent), context_processors=[attach_permissions_comparison])
+env = jinja2.Environment(loader=jinja2.ChoiceLoader([jinja2.FileSystemLoader(str(Path(__file__).resolve().parent))]))
+templates = Jinja2Templates(context_processors=[attach_permissions_comparison], env=env)
+
+
+def add_template_handler(handler: Jinja2Templates):
+    templates.env.loader.loaders.append(handler.env.loader)
+
+
+templates.add_template_handler = add_template_handler

goosebit/ui/templates/devices.html.jinja

@@ -4,26 +4,6 @@
         <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>

goosebit/ui/templates/login.html.jinja

@@ -31,11 +31,15 @@
                                      alt="gooseBit Logo" />
                             </div>
                         </div>
+                        <div id="login_error" class="alert alert-danger d-none" role="alert">
+                            <!-- Error message will be inserted here -->
+                        </div>
                         <form method="post" id="login_form">
                             <div class="form-outline form-white mb-4">
                                 <input type="email"
                                        id="username"
                                        name="username"
+                                       autocomplete="username"
                                        placeholder="Email"
                                        class="form-control form-control-lg" />
                             </div>
@@ -43,6 +47,7 @@
                                 <input type="password"
                                        id="password"
                                        name="password"
+                                       autocomplete="current-password"
                                        placeholder="Password"
                                        class="form-control form-control-lg" />
                             </div>

goosebit/ui/templates/nav.html.jinja

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <script>const PERMISSIONS = {{request.user.get_json_permissions() | safe}};</script>
+        <script>const PERMISSIONS = {{request.user.permissions | safe}};</script>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>{{ title }}</title>
@@ -60,19 +60,31 @@
                 box-shadow: none!important;
             }
         </style>
-        <script>const TABLE_UPDATE_TIME = 3000;</script>
+        <script>
+            const TABLE_UPDATE_TIME = 3000;
+            DataTable.ext.errMode = function ( e, settings, helpPage, message ) {
+                if (e.jqXHR.status == 401) {
+                    window.location.reload();
+                } else if (e.jqXHR.status >= 200 && e.jqXHR.status < 300) {
+                    console.error("AJAX query error when reloading datatable");
+                }
+                console.error("Unknown error when reloading datatable");
+            };
+
+        </script>
         <script src="{{ url_for('static', path='js/util.js') }}"></script>
     </head>
     <body data-bs-theme="dark">
         <nav class="navbar navbar-expand-lg bg-body-tertiary">
             <div class="container-fluid">
-                <a class="navbar-brand" href="{{ request.url_for('home_ui') }}">
+                <a class="navbar-brand" href="{{ request.url_for('devices_ui') }}">
                     <img src="{{ request.url_for('static', path='svg/goosebit-logo.svg') }}"
                          class="me-2"
                          height="30px"
                          width="30px"
                          alt="gooseBit logo" />
                     gooseBit
+                    <small class="text-muted">v{{ request.app.version }}</small>
                 </a>
                 <button class="navbar-toggler"
                         type="button"
@@ -86,14 +98,21 @@
                 <div class="collapse navbar-collapse" id="navbar">
                     <div class="navbar-nav">
                         {% for nav_item in request.nav %}
-                            {% if compare_permissions(nav_item.permissions, request.user.permissions) %}
-                                <a class="nav-link{% if request.url == request.url_for(nav_item.function) %} active{% endif %}"
-                                   href="{{ request.url_for(nav_item.function) }}">{{ nav_item.text }}</a>
+                            {% if nav_item.show %}
+                                {% if compare_permissions(nav_item.permissions, request.user.permissions) %}
+                                    <a class="nav-link{% if request.url == request.url_for(nav_item.function) %} active{% endif %}"
+                                       href="{{ request.url_for(nav_item.function) }}">{{ nav_item.text }}</a>
+                                {% endif %}
                             {% endif %}
                         {% endfor %}
                     </div>
                     <div class="navbar-nav d-flex flex-fill justify-content-end">
-                        <a class="nav-link" href="{{ request.url_for('logout') }}">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
+                        {% if compare_permissions("goosebit.settings", request.user.permissions) %}
+                            <a class="nav-link ps-3 me-2 border-start"
+                               href="{{ request.url_for('settings_ui') }}">Settings<i class="bi bi-gear ps-2"></i></a>
+                        {% endif %}
+                        <a class="nav-link ps-3 border-start"
+                           href="{{ request.url_for('logout') }}">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
                     </div>
                 </div>
             </div>

goosebit/ui/templates/rollouts.html.jinja

@@ -4,28 +4,13 @@
         <div class="row p-2 d-flex justify-content-center">
             <div class="col">
                 <table id="rollout-table" class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th>Id</th>
-                            <th>Created</th>
-                            <th>Name</th>
-                            <th>Feed</th>
-                            <th>Software File</th>
-                            <th>Software Version</th>
-                            <th>Paused</th>
-                            <th>Success Count</th>
-                            <th>Failure Count</th>
-                        </tr>
-                    </thead>
-                    <tbody id="rollouts-list">
-                    </tbody>
                 </table>
             </div>
         </div>
     </div>
     {% if compare_permissions(["rollout.write"], request.user.permissions) %}
-        <div class="modal" id="rollout-create-modal">
-            <div class="modal-dialog modal-lg">
+        <div class="modal modal-lg fade" id="rollout-create-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">Create Rollout</h5>
@@ -46,7 +31,7 @@
                                 <input class="form-control" id="rollout-selected-feed" required />
                                 <div class="invalid-feedback">Feed missing. Use "default" if working with a single feed.</div>
                             </div>
-                            <div class="form-group mb-3">
+                            <div class="form-group">
                                 <div class="input-group mb-3 has-validation">
                                     <span class="input-group-text">Software</span>
                                     <select class="form-control"
@@ -59,10 +44,7 @@
                                             required></select>
                                     <div class="invalid-feedback">Software 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>
+                                <button type="submit" class="btn btn-outline-light w-100">Save changes</button>
                             </div>
                         </div>
                     </form>

goosebit/ui/templates/settings.html.jinja

@@ -0,0 +1,88 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <style>
+        input[type="checkbox"].ignore-validation:valid,
+        input[type="checkbox"].ignore-validation:invalid {
+            border-color: var(--bs-border-color);
+        }
+    </style>
+    <div class="container-fluid">
+        <ul class="nav nav-underline nav-fill my-2">
+            <li class="nav-item" role="presentation">
+                <button class="nav-link active"
+                        id="settings-users-tab"
+                        data-bs-toggle="tab"
+                        data-bs-target="#settings-users-panel"
+                        type="button"
+                        role="tab">Users</button>
+            </li>
+        </ul>
+        <div class="tab-content mb-2">
+            <div class="tab-pane fade show active"
+                 id="settings-users-panel"
+                 role="tabpanel">
+                <table id="users-table" class="table table-hover">
+                </table>
+            </div>
+        </div>
+    </div>
+    {% if compare_permissions(["settings.write"], request.user.permissions) %}
+        <div class="modal modal-lg fade" id="create-user-modal">
+            <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Create User</h5>
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <form id="create-user-form" class="needs-validation" novalidate>
+                        <div class="modal-body">
+                            <div class="input-group mb-3 has-validation">
+                                <span class="input-group-text">Username</span>
+                                <input class="form-control" type="text" id="create-user-username" required />
+                                <div class="invalid-feedback">Username missing.</div>
+                            </div>
+                            <div class="input-group mb-3 has-validation">
+                                <span class="input-group-text">Password</span>
+                                <input class="form-control" type="text" id="create-user-password" required />
+                                <div class="invalid-feedback">Password missing.</div>
+                            </div>
+                            <div class="input-group mb-3 has-validation">
+                                <input type="checkbox"
+                                       id="create-user-permissions-validator"
+                                       required
+                                       style="display:none">
+                                <div class="col" id="create-user-permissions"></div>
+                                <div class="invalid-feedback">Please set at least one permission.</div>
+                            </div>
+                            <input class="btn btn-outline-light w-100"
+                                   id="create-user-submit"
+                                   type="submit"
+                                   value="Create User" />
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    {% else %}
+        <div class="modal modal-lg fade" id="upload-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        Unavailable
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="alert alert-warning m-0" role="alert">You do not have permission to add users.</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    <script src="{{ url_for('static', path='js/settings.js') }}"></script>
+{% endblock content %}

goosebit/ui/templates/setup.html.jinja

@@ -0,0 +1,71 @@
+<!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>
+                        <div class="row mb-2 p-2">
+                            <div class="col d-flex align-items-center">
+                                <p class="m-0">Welcome to gooseBit. Please create an admin user.</p>
+                            </div>
+                        </div>
+                        <form method="post" id="setup_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"
+                                       autocomplete="new-password"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <div class="form-outline form-white mb-4">
+                                <input type="password"
+                                       id="password_confirm"
+                                       name="password_confirm"
+                                       placeholder="Confirm Password"
+                                       autocomplete="new-password"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <button class="btn btn-outline-light btn-lg px-5 w-100" type="submit">Setup</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script src="{{ url_for('static', path='js/setup.js') }}"></script>
+    </body>
+</html>

goosebit/ui/templates/software.html.jinja

@@ -4,17 +4,6 @@
         <div class="row p-2 pt-4 g-4 d-flex justify-content-center">
             <div class="col">
                 <table id="software-table" class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th>ID</th>
-                            <th>Name</th>
-                            <th>Version</th>
-                            <th>Compatibility</th>
-                            <th>Size</th>
-                        </tr>
-                    </thead>
-                    <tbody id="software-list">
-                    </tbody>
                 </table>
             </div>
         </div>