+
+
{{ form.email.label(class="form-control-label") }}
{% if form.email.errors %}
{{ form.email(class="form-control form-control-lg is-invalid") }}
diff --git a/webinterface/minibase/users/__pycache__/forms.cpython-311.pyc b/webinterface/minibase/users/__pycache__/forms.cpython-311.pyc
index 6be07fcd..906ccb87 100644
Binary files a/webinterface/minibase/users/__pycache__/forms.cpython-311.pyc and b/webinterface/minibase/users/__pycache__/forms.cpython-311.pyc differ
diff --git a/webinterface/minibase/users/__pycache__/routes.cpython-311.pyc b/webinterface/minibase/users/__pycache__/routes.cpython-311.pyc
index 95e5d765..39f07443 100644
Binary files a/webinterface/minibase/users/__pycache__/routes.cpython-311.pyc and b/webinterface/minibase/users/__pycache__/routes.cpython-311.pyc differ
diff --git a/webinterface/minibase/users/__pycache__/utils.cpython-311.pyc b/webinterface/minibase/users/__pycache__/utils.cpython-311.pyc
index 029bc236..c52170a4 100644
Binary files a/webinterface/minibase/users/__pycache__/utils.cpython-311.pyc and b/webinterface/minibase/users/__pycache__/utils.cpython-311.pyc differ
diff --git a/webinterface/minibase/users/forms.py b/webinterface/minibase/users/forms.py
index 50354a53..3350390c 100644
--- a/webinterface/minibase/users/forms.py
+++ b/webinterface/minibase/users/forms.py
@@ -5,70 +5,69 @@ from wtforms.validators import DataRequired, Length, Email, EqualTo, ValidationE
from flask_login import current_user
from minibase.models import User
-class registrationForm(FlaskForm):
- username = StringField('User Name',
- validators=[DataRequired(),Length(min = 3, max = 20)])
- email = StringField('Email',
- validators=[DataRequired(),Email()])
- password = PasswordField('Password',
- validators=[DataRequired()])
- password_confirm = PasswordField('Confirm Password',
- validators=[DataRequired(), EqualTo('password')])
- submit = SubmitField('Sing Up')
+class registrationForm(FlaskForm): # Defines the form class to be used for the user registretion
+ # Decalarion of the fields for the form and it's propereties
+ username = StringField('User Name', validators=[DataRequired(), Length(min=3, max=20)])
+ email = StringField('Email', validators=[DataRequired(), Email()])
+ password = PasswordField('Password', validators=[DataRequired()])
+ password_confirm = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password')])
+ submit = SubmitField('Sing Up')
+
+ # Queries to be made in order to validate the form : If username exists
def validate_username(self, username):
- user = User.query.filter_by(username=username.data).first()
- if user:
+ user = User.query.filter_by(username=username.data).first() # Database Querry
+ if user:
raise ValidationError('That username is taken please choose another one')
-
+
+ # Queries to be made in order to validate the form : If Email exists
def validate_email(self, email):
- email = User.query.filter_by(email=email.data).first()
- if email:
+ email = User.query.filter_by(email=email.data).first() # Database Querry
+ if email:
raise ValidationError('That email is taken do you have an acocunt ?')
-class loginForm(FlaskForm):
- email = StringField('Email',
- validators=[DataRequired(),Email()])
- password = PasswordField('Password',
- validators=[DataRequired()])
- remember = BooleanField('Remember Me')
+
+class loginForm(FlaskForm): # Defines the form class to be used for the user login
+ email = StringField('Email', validators=[DataRequired(), Email()])
+ password = PasswordField('Password', validators=[DataRequired()])
+ remember = BooleanField('Remember Me')
submit = SubmitField('Log In')
-class updateAccountForm(FlaskForm):
- username = StringField('User Name',
- validators=[DataRequired(),Length(min = 3, max = 20)])
- email = StringField('Email',
- validators=[DataRequired(),Email()])
- picture = FileField('Update Profile Picture',
- validators=[FileAllowed(['jpg','png'])])
- submit = SubmitField('Update')
-
+
+class updateAccountForm(FlaskForm): # Defines the form class to be used for the user update
+ username = StringField('User Name', validators=[DataRequired(), Length(min=3, max=20)])
+ email = StringField('Email', validators=[DataRequired(), Email()])
+ picture = FileField('Update Profile Picture', validators=[FileAllowed(['jpg', 'png'])])
+ submit = SubmitField('Update')
+
+ # Queries to be made in order to validate the form : If username exists
def validate_username(self, username):
if username.data != current_user.username:
user = User.query.filter_by(username=username.data).first()
- if user:
+ if user:
raise ValidationError('That username is taken please choose another one')
-
+
+ # Queries to be made in order to validate the form : If Email exists
def validate_email(self, email):
if email.data != current_user.email:
email = User.query.filter_by(email=email.data).first()
- if email:
+ if email:
raise ValidationError('That email is taken do you have an acocunt ?')
-class requestResetForm(FlaskForm):
- email = StringField('Email',
- validators=[DataRequired(),Email()])
- submit = SubmitField('Request Password Reset')
-
+
+class requestResetForm(FlaskForm): # Defines the form class to be used for the reset form
+ email = StringField('Email', validators=[DataRequired(), Email()])
+ submit = SubmitField('Request Password Reset')
+
+ # Queries to be made in order to validate the form : If Email exists
def validate_email(self, email):
email = User.query.filter_by(email=email.data).first()
- if email is None:
+ if email is None:
raise ValidationError('There is no Account with this email your must register first.')
-class resetPasswordForm(FlaskForm):
- password = PasswordField('Password',
- validators=[DataRequired()])
- password_confirm = PasswordField('Confirm Password',
- validators=[DataRequired(), EqualTo('password')])
- submit = SubmitField('Reset Password')
+
+class resetPasswordForm(FlaskForm): # Defines the form class to be used for password reset form
+ password = PasswordField('Password', validators=[DataRequired()])
+ password_confirm = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password')])
+ submit = SubmitField('Reset Password')
diff --git a/webinterface/minibase/users/routes.py b/webinterface/minibase/users/routes.py
index 1f09feca..cf2d1593 100644
--- a/webinterface/minibase/users/routes.py
+++ b/webinterface/minibase/users/routes.py
@@ -1,60 +1,70 @@
from flask import render_template, url_for, flash, redirect, request, Blueprint
from flask_login import login_user, current_user, logout_user, login_required
from minibase import db, bcrypt
+from minibase.config import themeMinibase
from minibase.models import User, Post
-from minibase.users.forms import registrationForm, loginForm, updateAccountForm, requestResetForm, resetPasswordForm
-from minibase.posts.forms import postForm
+from minibase.users.forms import (registrationForm, loginForm, updateAccountForm,
+ requestResetForm, resetPasswordForm)
from minibase.users.utils import save_picture, send_reset_email
# Declaring a blueprint
-users = Blueprint('users', __name__)
+users = Blueprint('users', __name__)
-#Route is the file that is going to be generated
-@users.route("/register", methods=['GET', 'POST'])
+
+# Route is the file that is going to be generated
+@users.route("/register", methods=['GET', 'POST'])
def register():
if current_user.is_authenticated:
- return redirect(url_for('main.home'))
+ return redirect(url_for('main.home'))
form = registrationForm()
- if form.validate_on_submit():
- hashed_pw = bcrypt.generate_password_hash(form.password.data).decode('utf-8')
+ if form.validate_on_submit():
+ hashed_pw = bcrypt.generate_password_hash(form.password.data).decode('utf-8')
user = User(username=form.username.data, email=form.email.data, password=hashed_pw)
db.session.add(user)
db.session.commit()
- flash(f'Your account has benn created you can now log in!','success')
- return redirect(url_for('users.login'))
+ flash(f'{"Your account has been created you can now log in!"}', 'success')
+ return redirect(url_for('users.login'))
- return render_template('register.html', title='Register', form=form)
+ return render_template('register.html',
+ title='Register',
+ theme=themeMinibase,
+ form=form)
-@users.route("/login", methods=['GET', 'POST'])
+
+@users.route("/login", methods=['GET', 'POST'])
def login():
- if current_user.is_authenticated:
- return redirect(url_for('main.home'))
+ if current_user.is_authenticated: # Is the user alredy authenticated?
+ return redirect(url_for('main.home')) # Then redirect home
+
form = loginForm()
- if form.validate_on_submit():
+ if form.validate_on_submit():
user = User.query.filter_by(email=form.email.data).first()
if user and bcrypt.check_password_hash(user.password, form.password.data):
- login_user(user,remember=form.remember.data)
+ login_user(user, remember=form.remember.data)
next_page = request.args.get('next')
return redirect(next_page) if next_page else redirect(url_for('main.home'))
else:
- flash('Login unsuccessful. Please chek your Email and Password!','danger')
- return render_template('login.html', title='Login', form=form)
+ flash('Login unsuccessful. Please chek your Email and Password!', 'danger')
+ return render_template('login.html',
+ title='Login',
+ theme=themeMinibase,
+ form=form)
-@users.route("/logout")
+@users.route("/logout")
def logout():
logout_user()
return redirect(url_for('main.home'))
-@users.route("/account", methods=['GET', 'POST'])
+@users.route("/account", methods=['GET', 'POST'])
@login_required
def account():
form = updateAccountForm()
if form.validate_on_submit():
if form.picture.data:
- picture_file = save_picture(form.picture.data)
+ picture_file = save_picture(form.picture.data)
current_user.image_file = picture_file
current_user.username = form.username.data
current_user.email = form.email.data
@@ -64,43 +74,56 @@ def account():
elif request.method == 'GET':
form.username.data = current_user.username
form.email.data = current_user.email
- image_file = url_for('static', filename='pics/'+ current_user.image_file)
- return render_template('account.html', title='Account', image_file = image_file, form=form)
+ image_file = url_for('static', filename='pics/' + current_user.image_file)
+ return render_template('account.html',
+ title='Account',
+ image_file=image_file,
+ theme=themeMinibase,
+ form=form)
-@users.route("/user/")
+@users.route("/user/")
def user_posts(username):
user = User.query.filter_by(username=username).first_or_404()
page = request.args.get('page', 1, type=int)
posts = Post.query.filter_by(author=user)\
.order_by(Post.date_posted.asc())\
.paginate(page=page, per_page=2)
- return render_template('user_posts.html', posts=posts, user=user)
+ return render_template('user_posts.html',
+ posts=posts,
+ user=user)
-@users.route("/reset_password", methods=['GET', 'POST'])
+@users.route("/reset_password", methods=['GET', 'POST'])
def reset_request():
if current_user.is_authenticated:
- return redirect(url_for('main.home'))
+ return redirect(url_for('main.home'))
form = requestResetForm()
if form.validate_on_submit():
user = User.query.filter_by(email=form.email.data).first()
send_reset_email(user)
flash('An Email has benn sent with instruction to reset your password', 'warning')
- return render_template('reset_request.html', title='Reset Password', form=form)
+ return render_template('reset_request.html',
+ title='Reset Password',
+ theme=themeMinibase,
+ form=form)
-@users.route("/reset_password/", methods=['GET', 'POST'])
+
+@users.route("/reset_password/", methods=['GET', 'POST'])
def reset_token(token):
if current_user.is_authenticated:
- return redirect(url_for('main.home'))
+ return redirect(url_for('main.home'))
user = User.verify_reset_token(token)
- if user is None:
+ if user is None:
flash('That is an invalid or expired token', 'warning')
return redirect(url_for('users.reset_request'))
form = resetPasswordForm()
- if form.validate_on_submit():
- hashed_pw = bcrypt.generate_password_hash(form.password.data).decode('utf-8')
+ if form.validate_on_submit():
+ hashed_pw = bcrypt.generate_password_hash(form.password.data).decode('utf-8')
user.password = hashed_pw
db.session.commit()
- flash(f'Your password has benn udated','success')
- return redirect(url_for('users.login'))
- return render_template('reset_token.html', title='Reset Password', form=form)
+ flash(f'{"Your password has benn updated"}', 'success')
+ return redirect(url_for('users.login'))
+ return render_template('reset_token.html',
+ title='Reset Password',
+ theme=themeMinibase,
+ form=form)
diff --git a/webinterface/minibase/users/utils.py b/webinterface/minibase/users/utils.py
index c30ff03d..e0917270 100644
--- a/webinterface/minibase/users/utils.py
+++ b/webinterface/minibase/users/utils.py
@@ -5,24 +5,26 @@ from flask import url_for, current_app
from flask_mail import Message
from minibase import mail
-def save_picture(form_picture):
+
+def save_picture(form_picture):
random_hex = secrets.token_hex(8)
- _, f_ext =os.path.splitext(form_picture.filename)
+ _, f_ext = os.path.splitext(form_picture.filename)
picture_fn = random_hex + f_ext
picture_path = os.path.join(current_app.root_path, 'static/pics', picture_fn)
- output_size = (125,125)
+ output_size = (125, 125)
i = Image.open(form_picture)
- i.thumbnail(output_size)
+ i.thumbnail(output_size)
i.save(picture_path)
return picture_fn
-def send_reset_email(user):
+
+def send_reset_email(user):
token = user.get_reset_token()
- msg = Message('Password Reset Request',
- sender='noreply@demo.com',
+ msg = Message('Password Reset Request',
+ sender='noreply@demo.com',
recipients=[user.email])
- msg.body = f'''To reset your password, visit the following link:
-{url_for('reset_token', token=token, _external=True)}
+ msg.body = f'''To reset your password, visit the following link:
+{url_for('reset_token', token=token, _external=True)}
If you didn't make this request, then simply ingnore this email and no chancges will be made.
'''
mail.send(msg)
diff --git a/webinterface/run.py b/webinterface/run.py
index 8ac58c70..6634dd12 100644
--- a/webinterface/run.py
+++ b/webinterface/run.py
@@ -1,7 +1,7 @@
from minibase import create_minibase
-#Enable debug option even if run directly form Python3
+# Enable debug option even if run directly form Python3
-app=create_minibase()
+app = create_minibase()
-if __name__ == '__main__':
+if __name__ == '__main__':
app.run(debug=True)
diff --git a/webinterface/site.db b/webinterface/site.db
deleted file mode 100644
index e48916f7..00000000
Binary files a/webinterface/site.db and /dev/null differ