mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2024-12-25 02:44:18 +00:00
Make the about page the index page.
This commit is contained in:
parent
d6f60e4267
commit
e327f0c8bf
@ -18,7 +18,7 @@ def login():
|
|||||||
login_user(user, form.remember_me.data)
|
login_user(user, form.remember_me.data)
|
||||||
next = request.args.get('next')
|
next = request.args.get('next')
|
||||||
if next is None or not next.startswith('/'):
|
if next is None or not next.startswith('/'):
|
||||||
next = url_for('main.index')
|
next = url_for('main.dashboard')
|
||||||
return redirect(next)
|
return redirect(next)
|
||||||
flash('Invalid username or password.')
|
flash('Invalid username or password.')
|
||||||
return render_template('auth/login.html.j2', form=form, title='Log in')
|
return render_template('auth/login.html.j2', form=form, title='Log in')
|
||||||
@ -35,7 +35,7 @@ def logout():
|
|||||||
@auth.route('/register', methods=['GET', 'POST'])
|
@auth.route('/register', methods=['GET', 'POST'])
|
||||||
def register():
|
def register():
|
||||||
if not current_user.is_anonymous:
|
if not current_user.is_anonymous:
|
||||||
return redirect(url_for('main.index'))
|
return redirect(url_for('main.dashboard'))
|
||||||
form = RegistrationForm()
|
form = RegistrationForm()
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
user = User(email=form.email.data.lower(),
|
user = User(email=form.email.data.lower(),
|
||||||
@ -61,7 +61,7 @@ def confirm(token):
|
|||||||
flash('You have confirmed your account. Thanks!')
|
flash('You have confirmed your account. Thanks!')
|
||||||
else:
|
else:
|
||||||
flash('The confirmation link is invalid or has expired.')
|
flash('The confirmation link is invalid or has expired.')
|
||||||
return redirect(url_for('main.index'))
|
return redirect(url_for('main.dashboard'))
|
||||||
|
|
||||||
|
|
||||||
@auth.before_app_request
|
@auth.before_app_request
|
||||||
@ -91,13 +91,13 @@ def resend_confirmation():
|
|||||||
send_email(current_user.email, 'Confirm Your Account', 'auth/email/confirm',
|
send_email(current_user.email, 'Confirm Your Account', 'auth/email/confirm',
|
||||||
user=current_user, token=token)
|
user=current_user, token=token)
|
||||||
flash('A new confirmation email has benn sent to you by email.')
|
flash('A new confirmation email has benn sent to you by email.')
|
||||||
return redirect(url_for('main.index'))
|
return redirect(url_for('main.dashboard'))
|
||||||
|
|
||||||
|
|
||||||
@auth.route('/reset', methods=['GET', 'POST'])
|
@auth.route('/reset', methods=['GET', 'POST'])
|
||||||
def password_reset_request():
|
def password_reset_request():
|
||||||
if not current_user.is_anonymous:
|
if not current_user.is_anonymous:
|
||||||
return redirect(url_for('main.index'))
|
return redirect(url_for('main.dashboard'))
|
||||||
form = PasswordResetRequestForm()
|
form = PasswordResetRequestForm()
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
user = User.query.filter_by(email=form.email.data.lower()).first()
|
user = User.query.filter_by(email=form.email.data.lower()).first()
|
||||||
@ -116,7 +116,7 @@ def password_reset_request():
|
|||||||
@auth.route('/reset/<token>', methods=['GET', 'POST'])
|
@auth.route('/reset/<token>', methods=['GET', 'POST'])
|
||||||
def password_reset(token):
|
def password_reset(token):
|
||||||
if not current_user.is_anonymous:
|
if not current_user.is_anonymous:
|
||||||
return redirect(url_for('main.index'))
|
return redirect(url_for('main.dashboard'))
|
||||||
form = PasswordResetForm()
|
form = PasswordResetForm()
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
if User.reset_password(token, form.password.data):
|
if User.reset_password(token, form.password.data):
|
||||||
|
@ -10,7 +10,12 @@ import hashlib
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
@main.route('/', methods=['GET', 'POST'])
|
@main.route('/')
|
||||||
|
def index():
|
||||||
|
return render_template('main/index.html.j2', title='Opaque')
|
||||||
|
|
||||||
|
|
||||||
|
@main.route('/dashboard', methods=['GET', 'POST'])
|
||||||
@login_required
|
@login_required
|
||||||
def dashboard():
|
def dashboard():
|
||||||
create_corpus_form = CreateCorpusForm()
|
create_corpus_form = CreateCorpusForm()
|
||||||
@ -44,18 +49,10 @@ def dashboard():
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@main.route('/about')
|
|
||||||
def about():
|
|
||||||
return render_template('main/about.html.j2', title='About')
|
|
||||||
|
|
||||||
|
|
||||||
@main.route('/admin', methods=['GET', 'POST'])
|
@main.route('/admin', methods=['GET', 'POST'])
|
||||||
@login_required
|
@login_required
|
||||||
@admin_required
|
@admin_required
|
||||||
def for_admins_only():
|
def for_admins_only():
|
||||||
"""
|
|
||||||
View for admin page only accesible by admins.
|
|
||||||
"""
|
|
||||||
users = User.query.order_by(User.username).all()
|
users = User.query.order_by(User.username).all()
|
||||||
items = [AdminUserItem(u.username, u.email, u.role_id, u.confirmed) for u in users]
|
items = [AdminUserItem(u.username, u.email, u.role_id, u.confirmed) for u in users]
|
||||||
table = AdminUserTable(items)
|
table = AdminUserTable(items)
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<div class="navbar-fixed">
|
<div class="navbar-fixed">
|
||||||
<nav>
|
<nav>
|
||||||
<div class="nav-wrapper">
|
<div class="nav-wrapper">
|
||||||
<a href="{{ url_for('main.dashboard') }}" class="brand-logo"><i class="material-icons">opacity</i>Opaque</a>
|
<a href="{{ url_for('main.index') }}" class="brand-logo"><i class="material-icons">opacity</i>Opaque</a>
|
||||||
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
|
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
|
||||||
<ul class="right hide-on-med-and-down">
|
<ul class="right hide-on-med-and-down">
|
||||||
<li><a id="nav-notifications" class="dropdown-trigger" href="#!" data-target="nav-notifications-dropdown"><i class="material-icons">notifications</i></a></li>
|
<li><a id="nav-notifications" class="dropdown-trigger" href="#!" data-target="nav-notifications-dropdown"><i class="material-icons">notifications</i></a></li>
|
||||||
@ -60,8 +60,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
<li><a href="{{ url_for('main.index') }}"><i class="material-icons">opacity</i>Opaque</a></li>
|
||||||
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
|
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
|
||||||
<li><a href="{{ url_for('main.about') }}"><i class="material-icons">info</i>About</a></li>
|
|
||||||
<li class="no-padding">
|
<li class="no-padding">
|
||||||
<ul class="collapsible collapsible-accordion">
|
<ul class="collapsible collapsible-accordion">
|
||||||
<li>
|
<li>
|
||||||
|
Loading…
Reference in New Issue
Block a user