From 4309d65c854c7d974efbbf14aed1ff5f3b528bd8 Mon Sep 17 00:00:00 2001 From: iou1name Date: Thu, 26 Sep 2019 14:39:48 -0400 Subject: [PATCH] lighthouse score --- buckler.py | 6 +++--- static/buckler.js | 10 +++++----- templates/index.html | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buckler.py b/buckler.py index 56488f7..06271d3 100644 --- a/buckler.py +++ b/buckler.py @@ -44,16 +44,16 @@ async def index(request): "SELECT * FROM user_credential WHERE user_id = $1", request['session']['id']) active_sessions = await conn.fetch( - "SELECT ip_address FROM user_session " + "SELECT id, ip_address FROM user_session " "WHERE user_id = $1", request['session']['id']) if request['session']['admin']: - users = defaultdict(lambda: [False]*len(apps)) + users = defaultdict(lambda: {app['name']: False for app in apps}) for user_perm in user_perms: index = tools.find_dict(apps, 'id', user_perm['app_id']) if index != -1: - users[user_perm['username']][index] = True + users[user_perm['username']][apps[index]['name']] = True users_json = json.dumps(users) return render_template("index.html", request, locals()) diff --git a/static/buckler.js b/static/buckler.js index dca9f39..9cf4471 100644 --- a/static/buckler.js +++ b/static/buckler.js @@ -14,19 +14,19 @@ function load() { function perm_change(row) { let user_perms = users_perms[row.children[0].textContent]; - let row_perms = []; + let row_perms = {}; for (let child of row.children) { if (child.firstChild.type == "checkbox") { if (child.firstChild.checked) { - row_perms.push(true); + row_perms[child.firstChild.dataset.appName] = true; } else { - row_perms.push(false); + row_perms[child.firstChild.dataset.appName] = false; } } } let perms_changed = false; - for (let i = 0; i < user_perms.length; i++) { - if (user_perms[i] != row_perms[i]) { + for (let app_name of Object.keys(user_perms)) { + if (user_perms[app_name] != row_perms[app_name]) { perms_changed = true; } } diff --git a/templates/index.html b/templates/index.html index 580329c..5841303 100644 --- a/templates/index.html +++ b/templates/index.html @@ -47,8 +47,8 @@ {% for username, values in users.items() %} {{ username }} - {% for value in values %} - + {% for name, value in values.items() %} + {% endfor %} @@ -89,7 +89,7 @@ {% for key in fido2_keys %} {{ key['nick'] }} - + {% endfor %} @@ -115,7 +115,7 @@ {% for session in active_sessions %} {{ session['ip_address'] }} - + {% endfor %}