diff --git a/application/auth/forms.py b/application/auth/forms.py index 15e55b6..d0166ef 100644 --- a/application/auth/forms.py +++ b/application/auth/forms.py @@ -1,8 +1,9 @@ from flask_wtf import FlaskForm # type: ignore -from wtforms import StringField, SubmitField, PasswordField, validators +from wtforms import StringField, SubmitField, PasswordField +from wtforms.validators import DataRequired class LoginForm(FlaskForm): - username = StringField("Username", validators=[validators.DataRequired()]) + username = StringField("Username", validators=[DataRequired()]) password = PasswordField("Password") submit = SubmitField("Login") diff --git a/application/dash/views.py b/application/dash/views.py index 2725088..7c5cebf 100644 --- a/application/dash/views.py +++ b/application/dash/views.py @@ -16,6 +16,6 @@ def index(): @dash_blueprint.route("/admin", methods=["GET", "POST"]) -# @admin_required +@admin_required def admin(): return render_template("admin.html") diff --git a/application/templates/base_template.html b/application/templates/base_template.html index b25a3cf..8a77a90 100644 --- a/application/templates/base_template.html +++ b/application/templates/base_template.html @@ -30,7 +30,7 @@ - {% if current_user.is_authenticated %} + {% if current_user.is_admin %} diff --git a/seed.py b/seed.py index d11a96f..6070515 100644 --- a/seed.py +++ b/seed.py @@ -11,9 +11,19 @@ new_strikers = [ """ -new_user = User( - username="admin", password=generate_password_hash("admin"), is_admin=True -) +new_users = [ + User( + username="admin", + password=generate_password_hash("admin"), + is_admin=True, + ), + User( + username="test", + password=generate_password_hash("test123"), + is_admin=False, + ), +] + new_services = Service(name="test123", url="http://google.com") with app.app_context(): @@ -23,5 +33,5 @@ with app.app_context(): db.session.commit() # Then add new db.session.add(new_services) - db.session.add(new_user) + db.session.add_all(new_users) db.session.commit()