globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Refactored flask flash messages

Browse source
This commit is contained in:
Éloi Rivard 2020-10-31 18:22:24 +01:00
parent a925325fc5
commit 1300265a14
11 changed files with 47 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
canaille/account.py
View file

@ -43,6 +43,8 @@ def login():
flash(_("Login failed, please check your information"), "error")
return render_template("login.html", form=form)
user = User.get(form.login.data)
flash(_(f"Connection successful. Welcome {user.name}"), "success")
return redirect(url_for("canaille.account.index"))
return render_template("login.html", form=form)
@ -50,8 +52,12 @@ def login():
@bp.route("/logout")
def logout():
if current_user():
current_user().logout()
user = current_user()
if user:
flash(
_(f"You have been disconnected. See you next time {user.name}"), "success"
)
user.logout()
return redirect("/")

11
canaille/templates/admin/authorization_view.html
View file

@ -1,18 +1,15 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
<h3 class="ui top attached header">
{% trans %}View a authorization{% endtrans %}
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached clearing segment">
<ul>
{% for attr in authorization.may %}

11
canaille/templates/admin/client_add.html
View file

@ -1,18 +1,15 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
<h3 class="ui top attached header">
{% trans %}Add a client{% endtrans %}
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached clearing segment">
{{ sui.render_form(form, _("Confirm")) }}
</div>

11
canaille/templates/admin/client_edit.html
View file

@ -1,18 +1,15 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
<h3 class="ui top attached header">
{% trans %}Edit a client{% endtrans %}
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached clearing segment">
<div class="ui form">
<form id="readonly">

11
canaille/templates/admin/token_view.html
View file

@ -1,18 +1,15 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
<h3 class="ui top attached header">
{% trans %}View a token{% endtrans %}
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached clearing segment">
<ul>
{% for attr in token.may %}

9
canaille/templates/consent_list.html
View file

@ -1,4 +1,5 @@
{% extends 'base.html' %}
{% import 'flask.j2' as flask %}
{% block style %}
<link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@ -22,13 +23,7 @@
</div>
</h2>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
{% if consents %}
<div class="ui centered cards">

9
canaille/templates/flask.j2 Normal file
View file

@ -0,0 +1,9 @@
{% macro messages() %}
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{% endmacro %}

11
canaille/templates/forgotten-password.html
View file

@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
@ -11,13 +12,9 @@
{% trans %}Forgotten password{% endtrans %}
</div>
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached message">
{% trans %}
After this form is sent, if the email address or the login you provided

9
canaille/templates/login.html
View file

@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="ui clearing segment">
@ -16,13 +17,7 @@
<div class="sub header">{% trans %}Log-in and manage your authorizations.{% endtrans %}</div>
</h2>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<form method="POST"
id="{{ form.id or form.__class__.__name__|lower }}"

10
canaille/templates/profile.html
View file

@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="ui clearing segment">
@ -12,14 +13,7 @@
</div>
</h2>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
{{ sui.render_form(form, _("Edit"), action=request.url) }}
</div>
{% endblock %}

11
canaille/templates/reset-password.html
View file

@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %}
<div class="loginform">
@ -11,13 +12,9 @@
{% trans %}Password reset{% endtrans %}
</div>
</h3>
{% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %}
<div class="ui attached message {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endwith %}
{{ flask.messages() }}
<div class="ui attached clearing segment">
{{ sui.render_form(form, _("Password reset"), action=url_for("canaille.account.reset", uid=uid, hash=hash)) }}
</div>