archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Show badges to users in their profile settings

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-09-12 14:34:29 +02:00
parent 9a9ca1bf8b
commit 40933d51cf
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/auth/__init__.py
View File

@ -39,6 +39,7 @@ class UserClass(flask_login.UserMixin):
self.group_ids: typing.List[bson.ObjectId] = [] self.group_ids: typing.List[bson.ObjectId] = []
self.capabilities: typing.Set[str] = set() self.capabilities: typing.Set[str] = set()
self.nodes: dict = {} # see the 'nodes' key in eve_settings.py::user_schema. self.nodes: dict = {} # see the 'nodes' key in eve_settings.py::user_schema.
self.badges_html: str = ''
# Lazily evaluated # Lazily evaluated
self._has_organizations: typing.Optional[bool] = None self._has_organizations: typing.Optional[bool] = None
@ -57,6 +58,7 @@ class UserClass(flask_login.UserMixin):
user.email = db_user.get('email') or '' user.email = db_user.get('email') or ''
user.username = db_user.get('username') or '' user.username = db_user.get('username') or ''
user.full_name = db_user.get('full_name') or '' user.full_name = db_user.get('full_name') or ''
user.badges_html = db_user.get('badges', {}).get('html') or ''
# Be a little more specific than just db_user['nodes'] # Be a little more specific than just db_user['nodes']
user.nodes = { user.nodes = {

24
src/templates/users/settings/profile.pug
View File

@ -1,5 +1,23 @@
| {% extends 'users/settings/page.html' %} | {% extends 'users/settings/page.html' %}
| {% block settings_page_title %}{{ _("Profile") }}{% endblock %} | {% block settings_page_title %}{{ _("Profile") }}{% endblock %}
| {% block css %}
| {{ super() }}
//- TODO(Pablo): properly style badges, and move the styling to one of the SASS files.
style.
ul.blender-id-badges {
padding-left: 0;
list-style-type: none;
display: flex;
}
ul.blender-id-badges > li {
margin: 0;
padding: 0;
}
ul.blender-id-badges > li a {
display: block;
padding: 0.4em;
}
| {% endblock %}
| {% block settings_page_content %} | {% block settings_page_content %}
.settings-form .settings-form
form#settings-form(method='POST', action="{{url_for('settings.profile')}}") form#settings-form(method='POST', action="{{url_for('settings.profile')}}")
@ -21,6 +39,12 @@
.form-group .form-group
| {{ _("Change your full name, email, and password at") }} #[a(href="https://www.blender.org/id/settings/profile",target='_blank') Blender ID]. | {{ _("Change your full name, email, and password at") }} #[a(href="https://www.blender.org/id/settings/profile",target='_blank') Blender ID].
| {% if current_user.badges_html %}
.form-group
p Your Blender ID badges:
| {{ current_user.badges_html|safe }}
p.hint-text Note that updates to these badges may take a few minutes to be visible here.
| {% endif %}
.right .right
.settings-avatar .settings-avatar
a(href="https://gravatar.com/") a(href="https://gravatar.com/")