mirror of
https://github.com/StefBuwalda/WebTech.git
synced 2025-10-30 03:10:00 +00:00
Refractoring
This commit is contained in:
@@ -1,10 +1,8 @@
|
||||
from flask_wtf import FlaskForm # type: ignore
|
||||
from wtforms import (
|
||||
StringField,
|
||||
PasswordField,
|
||||
SubmitField,
|
||||
URLField,
|
||||
BooleanField,
|
||||
)
|
||||
from wtforms.validators import DataRequired
|
||||
|
||||
@@ -13,13 +11,3 @@ class ServiceForm(FlaskForm):
|
||||
name = StringField("Service name:", validators=[DataRequired()])
|
||||
url = URLField("Service URL:", validators=[DataRequired()])
|
||||
submit = SubmitField("Add")
|
||||
|
||||
|
||||
class RegisterForm(FlaskForm):
|
||||
username = StringField("Username", validators=[DataRequired()])
|
||||
password = PasswordField("Password", validators=[DataRequired()])
|
||||
confirm_password = PasswordField(
|
||||
"Confirm Password", validators=[DataRequired()]
|
||||
)
|
||||
is_admin = BooleanField("Admin")
|
||||
submit = SubmitField("Add")
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{% extends 'base_template.html' %}
|
||||
|
||||
{% block title %}
|
||||
Register
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<form class="bg-body-tertiary" method="POST">
|
||||
{{ form.hidden_tag() }}
|
||||
{% if feedback %}
|
||||
<p class="feedback">{{feedback}}</p>
|
||||
{% endif %}
|
||||
<div>
|
||||
{{ form.username.label }} <br> {{ form.username() }}
|
||||
</div>
|
||||
<div>
|
||||
{{ form.password.label }} <br> {{ form.password() }}
|
||||
</div>
|
||||
<div>
|
||||
{{ form.confirm_password.label }} <br> {{ form.confirm_password() }}
|
||||
</div>
|
||||
<div>
|
||||
{{ form.is_admin }} {{ form.is_admin.label }}
|
||||
</div>
|
||||
<div class="submit">
|
||||
{{ form.submit() }}
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@@ -1,11 +1,8 @@
|
||||
from application import db
|
||||
from flask import Blueprint, render_template, redirect, url_for
|
||||
from application.dash.forms import RegisterForm, ServiceForm
|
||||
from application.dash.forms import ServiceForm
|
||||
from flask_login import login_required, current_user # type: ignore
|
||||
from application.dash.models import Service
|
||||
from application.auth.models import User
|
||||
from application.decorators import admin_required
|
||||
from werkzeug.security import generate_password_hash
|
||||
|
||||
dash_blueprint = Blueprint("dash", __name__, template_folder="templates")
|
||||
|
||||
@@ -19,43 +16,6 @@ def index():
|
||||
return render_template("dashboard.html", services=services)
|
||||
|
||||
|
||||
@dash_blueprint.route("/admin", methods=["GET", "POST"])
|
||||
@admin_required
|
||||
def admin():
|
||||
register_form = RegisterForm()
|
||||
|
||||
if register_form.validate_on_submit(): # type: ignore
|
||||
username = register_form.username.data
|
||||
password = register_form.password.data
|
||||
confirm_password = register_form.confirm_password.data
|
||||
is_admin = register_form.is_admin.data
|
||||
if confirm_password != password:
|
||||
return render_template(
|
||||
"admin.html",
|
||||
form=register_form,
|
||||
feedback="Passwords don't match, please try again",
|
||||
)
|
||||
if User.query.filter_by(username=username).first():
|
||||
return render_template(
|
||||
"admin.html",
|
||||
form=register_form,
|
||||
feedback="Username is already taken",
|
||||
)
|
||||
new_user = User(
|
||||
username=username, # type: ignore
|
||||
password=generate_password_hash(password), # type: ignore
|
||||
is_admin=is_admin,
|
||||
)
|
||||
db.session.add(new_user)
|
||||
db.session.commit()
|
||||
return render_template(
|
||||
"admin.html",
|
||||
form=RegisterForm(formdata=None),
|
||||
feedback="User succesfully added",
|
||||
)
|
||||
return render_template("admin.html", form=register_form)
|
||||
|
||||
|
||||
@dash_blueprint.route("/delete_item/<int:service_id>", methods=["POST"])
|
||||
@login_required
|
||||
def delete_item(service_id: int):
|
||||
|
||||
Reference in New Issue
Block a user