Add Breadcrumbs and UserList to admin package

web/app/admin/views.py

@@ -8,11 +8,19 @@ from ..models import Role, User
 from ..settings import tasks as settings_tasks
 
 
+@admin.route('/')
+@login_required
+@admin_required
+def index():
+    return redirect(url_for('.users'))
+
+
 @admin.route('/users')
 @login_required
 @admin_required
 def users():
-    users = [user.to_dict() for user in User.query.all()]
+    # users = [user.to_dict() for user in User.query.all()]
+    users = {user.id: user.to_dict() for user in User.query.all()}
     return render_template('admin/users.html.j2', title='Users', users=users)
 
 
@@ -33,10 +41,10 @@ def delete_user(user_id):
     return redirect(url_for('.users'))
 
 
-@admin.route('/users/<int:user_id>/edit_general_settings', methods=['GET', 'POST'])  # noqa
+@admin.route('/users/<int:user_id>/edit', methods=['GET', 'POST'])  # noqa
 @login_required
 @admin_required
-def edit_general_settings(user_id):
+def edit_user(user_id):
     user = User.query.get_or_404(user_id)
     form = EditGeneralSettingsAdminForm(user=user)
     if form.validate_on_submit():
@@ -47,11 +55,11 @@ def edit_general_settings(user_id):
         user.role = Role.query.get(form.role.data)
         db.session.commit()
         flash('Settings have been updated.')
-        return redirect(url_for('.edit_general_settings', user_id=user.id))
+        return redirect(url_for('.edit_user', user_id=user.id))
     form.confirmed.data = user.confirmed
     form.dark_mode.data = user.setting_dark_mode
     form.email.data = user.email
     form.role.data = user.role_id
     form.username.data = user.username
-    return render_template('admin/edit_general_settings.html.j2',
-                           form=form, title='General settings', user=user)
+    return render_template('admin/edit_user.html.j2', form=form,
+                           title='Edit user', user=user)