buckler.py

@@ -45,7 +45,7 @@ async def index(request):
 			request['session']['id'])
 		active_sessions = await conn.fetch(
 			"SELECT id, ip_address, date_created, last_used FROM user_session "
-			"WHERE user_id = $1 ORDER BY last_used DESC",
+			"WHERE user_id = $1",
 			request['session']['id'])
 
 	if request['session']['admin']:
@@ -58,33 +58,11 @@ async def index(request):
 	return render_template("index.html", request, locals())
 
 
-@routes.post(config.url_prefix + '/change_password', name='change_password')
+@routes.get(config.url_prefix + '/change_password', name='change_password')
 @auth.auth_required
 async def change_password(request):
 	"""Allows a user to change their password."""
-	data = await request.post()
+	pass
-	current_pw = data.get('current_password')
-	new_pw = data.get('new_password')
-	verify_pw = data.get('verify_password')
-
-	if not all(current_pw, new_pw, verify_pw):
-		return
-	if not new_pw == verify_pw:
-		return
-
-	async with request.app['pool'].acquire() as conn:
-		pw_hash = conn.fetchrow(
-			"SELECT password_hash FROM user_info WHERE id = $1",
-			request['session']['id'])
-		if not argon2.verify(current_pw, pw_hash['password_hash']):
-			return
-		h = argon2.hash(new_pw)
-		conn.execute(
-			"UPDATE user_info SET password_hash = $1 WHERE id = $2",
-			h, request['session']['id'])
-	index_url = request.app.router['index'].url_for()
-	raise web.HTTPFound(location=index_url)
-
 
 
 @routes.get(config.url_prefix + '/login', name='login')

static/buckler.css

@@ -3,7 +3,6 @@ body {
 	margin-right: 10%;
 	background-color: lightgray;
 	font-family: Helvetica,sans-serif;
-	font-size: 14px;
 }
 
 header {
@@ -30,21 +29,12 @@ main section {
 				0 1px 5px 0 rgba(0, 0, 0, 0.12);
 }
 
-.sub_section {
+h2 {
-	box-shadow: none;
-	border: 1px solid lightgray;
-}
-
-h2, h3 {
 	font-size: 16px;
 	margin: 0;
 	cursor: pointer;
 }
 
-h3 {
-	font-size: 14px;
-}
-
 #avail_sites {
 	margin: 0;
 	padding-left: 1em;
@@ -64,17 +54,3 @@ tr {
 td {
 	text-align: center;
 }
-
-#change_password {
-	border: none;
-	border-collapse: separate; 
-	width: auto;
-}
-
-#change_password tr {
-	border: none;
-}
-
-#change_password td {
-	text-align: left;
-}

static/buckler.js

@@ -1,10 +1,5 @@
 function load() {
 	let headers = document.querySelectorAll('h2');
-	headers = Array.prototype.slice.call(headers);
-	let headers3 = document.querySelectorAll('h3');
-	headers3 = Array.prototype.slice.call(headers3);
-	headers = headers.concat(headers3);
-
 	headers.forEach(function(header) {
 		header.addEventListener('click', function() {
 			let article = this.nextElementSibling;

templates/index.html

@@ -30,36 +30,31 @@
 			</section>
 			{% if request['session']['admin'] %}
 			<section>
-				<h2>Admin Panel</h2>
+				<h2>User Permissions</h2>
 				<article style="display: none;">
-					<section class="sub_section">
+					<hr>
-						<h3>User Permissions</h3>
+					<table id="users">
-						<article style="display: none;">
+						<thead>
-							<hr>
+							<tr>
-							<table id="users">
+								<th>User</th>
-								<thead>
+								{% for app in apps %}
-									<tr>
+								<th>{{ app['name'] }}</th>
-										<th>User</th>
+								{% endfor %}
-										{% for app in apps %}
+								<th></th>
-										<th>{{ app['name'] }}</th>
+							</tr>
-										{% endfor %}
+						</thead>
-										<th></th>
+						<tbody>
-									</tr>
+							{% for username, values in users.items() %}
-								</thead>
+							<tr>
-								<tbody>
+								<td>{{ username }}</td>
-									{% for username, values in users.items() %}
+								{% for name, value in values.items() %}
-									<tr>
+								<td><input aria-label="{{ username }}-{{ name }}" data-app-name={{ name }} type="checkbox" onchange="perm_change(this.parentElement.parentElement)"{% if value %} checked{% endif %}></td>
-										<td>{{ username }}</td>
+								{% endfor %}
-										{% for name, value in values.items() %}
+								<td><input type="submit"></td>
-										<td><input aria-label="{{ username }}-{{ name }}" data-app-name={{ name }} type="checkbox" onchange="perm_change(this.parentElement.parentElement)"{% if value %} checked{% endif %}></td>
+							</tr>
-										{% endfor %}
+							{% endfor %}
-										<td><input type="submit"></td>
+						</tbody>
-									</tr>
+					</table>
-									{% endfor %}
-								</tbody>
-							</table>
-						</article>
-					</section>
 				</article>
 			</section>
 			{% endif %}
@@ -68,20 +63,12 @@
 				<article style="display: none;">
 					<hr>
 					<form action="{{ request.app.router['change_password'].url_for() }}" method="post" enctype="application/x-www-form-urlencoded">
-						<table id="change_password">
+						<label for="current_password">Current password</label>
-							<tr>
+						<input id="current_password" name="current_password" type="password"><br>
-								<td><label for="current_password">Current password</label></td>
+						<label for="new_password">New password</label>
-								<td><input id="current_password" name="current_password" type="password"></td>
+						<input id="new_password" name="new_password" type="password"><br>
-							</tr>
+						<label for="verify_password">Verify password</label>
-							<tr>
+						<input id="verify_password" name="verify_password" type="password"><br>
-								<td><label for="new_password">New password</label></td>
-								<td><input id="new_password" name="new_password" type="password"></td>
-							</tr>
-							<tr>
-								<td><label for="verify_password">Verify password</label></td>
-								<td><input id="verify_password" name="verify_password" type="password"></td>
-							</tr>
-						</table>
 						<input type="submit" value="Submit">
 					</form>
 				</article>