projects/tentacles/src/python/tentacles/__main__.py

@@ -6,7 +6,7 @@
 
 from pathlib import Path
 import click
-from flask import Flask, request, current_app
+from flask import Flask, request, session, current_app
 import tomllib
 from datetime import datetime
 

projects/tentacles/src/python/tentacles/blueprints/api.py

@@ -3,7 +3,7 @@
 """API endpoints supporting the 'ui'."""
 
 
-from flask import Blueprint
+from flask import Blueprint, request, Request, redirect
 
 BLUEPRINT = Blueprint("api", __name__, url_prefix="/api")
 

projects/tentacles/src/python/tentacles/blueprints/printer_ui.py

@@ -4,12 +4,17 @@
 
 import logging
 
+from click import group
 
 from flask import (
     Blueprint,
+    current_app,
     request,
+    Request,
     redirect,
     render_template,
+    session,
+    url_for,
     flash,
 )
 

projects/tentacles/src/python/tentacles/blueprints/user_ui.py

@@ -8,12 +8,16 @@ import re
 
 from tentacles.globals import ctx
 
+from click import group
 from flask import (
     Blueprint,
     current_app,
     request,
+    Request,
     redirect,
     render_template,
+    session,
+    url_for,
     flash,
 )
 

projects/tentacles/src/python/tentacles/blueprints/util.py

@@ -2,10 +2,17 @@
 
 import logging
 
+from click import group
 
 from flask import (
+    Blueprint,
     current_app,
+    request,
+    Request,
     redirect,
+    render_template,
+    session,
+    url_for,
     flash,
 )
 

projects/tentacles/src/python/tentacles/static/css/style.scss

@@ -307,17 +307,3 @@ form {
   border-radius: 1em;
   padding: 0.5em;
 }
-
-.keys ul li {
-  display: flex;
-  flex-direction: row;
-
-  span {
-    margin-right: 1em;
-  }
-
-  .key-key {
-    max-width: 20em;
-    overflow: clip;
-  }
-}

projects/tentacles/src/python/tentacles/templates/printers.html.j2

@@ -21,7 +21,7 @@
       {% endfor %}
     </ul>
     {% else %}
-      No printers available. {% if ctx.is_admin %}<a href="/printers/add">Configure one!</a>{% else %}Ask the admin to configure one!{% endif %}
+      No printers available. {% if request.is_admin %}<a href="/printers/add">Configure one!</a>{% else %}Ask the admin to configure one!{% endif %}
     {% endif %}
     {% endwith %}
   </div>

projects/tentacles/src/python/tentacles/templates/user.html.j2

@@ -1,14 +1,14 @@
 {% extends "base.html.j2" %}
 {% block content %}
 <h1>User settings</h1>
-<div class="keys">
+<div class="">
   <h2>API keys</h2>
   {% with keys = ctx.db.list_keys(ctx.uid) %}
   <ul>
     {% for id, name, exp in keys if name != 'web session' %}
     <li>
-      <span class="key-name">{{ name or 'anonymous' }}</span>
+      <span class="key-name">{{ name }}</span>
-      <span class="key-key">{{ id[:10] }}...</span>
+      <span class="key-key">{{ id }}</span>
       <span class="key-expiration">{{ 'Expires in' if exp else ''}} {{ exp - datetime.now() if exp else 'Never' }}</span>
       <form method="post">
         <input type="hidden" name="action" value="revoke">