mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-20 21:10:36 +00:00
More exception handling. Remove unused database models. New common view structure!
This commit is contained in:
@ -2,4 +2,4 @@ from flask import Blueprint
|
||||
|
||||
|
||||
main = Blueprint('main', __name__)
|
||||
from . import views # noqa
|
||||
from . import views
|
||||
|
@ -7,17 +7,16 @@ from ..models import User
|
||||
|
||||
@main.route('/', methods=['GET', 'POST'])
|
||||
def index():
|
||||
login_form = LoginForm(prefix='login-form')
|
||||
if login_form.validate_on_submit():
|
||||
user = User.query.filter_by(username=login_form.user.data).first()
|
||||
form = LoginForm(prefix='login-form')
|
||||
if form.validate_on_submit():
|
||||
user = User.query.filter_by(username=form.user.data).first()
|
||||
if user is None:
|
||||
user = User.query.filter_by(email=login_form.user.data).first()
|
||||
if user is not None and user.verify_password(login_form.password.data):
|
||||
login_user(user, login_form.remember_me.data)
|
||||
return redirect(url_for('main.dashboard'))
|
||||
user = User.query.filter_by(email=form.user.data.lower()).first()
|
||||
if user is not None and user.verify_password(form.password.data):
|
||||
login_user(user, form.remember_me.data)
|
||||
return redirect(url_for('.dashboard'))
|
||||
flash('Invalid email/username or password.')
|
||||
return render_template('main/index.html.j2', login_form=login_form,
|
||||
title='nopaque')
|
||||
return render_template('main/index.html.j2', form=form, title='nopaque')
|
||||
|
||||
|
||||
@main.route('/about_and_faq')
|
||||
@ -31,7 +30,6 @@ def dashboard():
|
||||
return render_template('main/dashboard.html.j2', title='Dashboard')
|
||||
|
||||
|
||||
|
||||
@main.route('/news')
|
||||
def news():
|
||||
return render_template('main/news.html.j2', title='News')
|
||||
@ -40,12 +38,9 @@ def news():
|
||||
@main.route('/privacy_policy')
|
||||
def privacy_policy():
|
||||
return render_template('main/privacy_policy.html.j2',
|
||||
title=('Information on the processing of personal'
|
||||
' data for the nopaque platform (GDPR)'))
|
||||
title='Privacy statement (GDPR)')
|
||||
|
||||
|
||||
@main.route('/terms_of_use')
|
||||
def terms_of_use():
|
||||
return render_template('main/terms_of_use.html.j2',
|
||||
title='General Terms of Use of the platform '
|
||||
'nopaque')
|
||||
return render_template('main/terms_of_use.html.j2', title='Terms of Use')
|
||||
|
Reference in New Issue
Block a user