Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

app/__init__.py

@@ -77,9 +77,6 @@ def create_app(config: Config = Config) -> Flask:
 
     from .main import bp as main_blueprint
     app.register_blueprint(main_blueprint, url_prefix='/')
-    
-    from .profile import bp as profile_blueprint
-    app.register_blueprint(profile_blueprint, url_prefix='/profile')
 
     from .services import bp as services_blueprint
     app.register_blueprint(services_blueprint, url_prefix='/services')

app/admin/routes.py

@@ -7,7 +7,7 @@ from app.models import Role, User, UserSettingJobStatusMailNotificationLevel
 from app.settings.forms import (
     EditNotificationSettingsForm
 )
-from app.profile.forms import EditProfileSettingsForm
+from app.users.forms import EditProfileSettingsForm
 from . import bp
 from .forms import AdminEditUserForm
 

app/profile/__init__.py

@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-
-bp = Blueprint('profile', __name__)
-from . import routes  # noqa

app/profile/routes.py

@@ -1,135 +0,0 @@
-from flask import (
-    abort,
-    current_app,
-    flash, 
-    Markup, 
-    redirect, 
-    render_template, 
-    send_from_directory,
-    url_for
-)
-from flask_login import current_user, login_required
-from threading import Thread
-import os
-from app import db
-from app.models import Avatar, ProfilePrivacySettings, User
-from . import bp
-from .forms import (
-  EditPrivacySettingsForm,
-  EditProfileSettingsForm,
-  EditPublicProfileInformationForm
-)
-
-@bp.before_request
-@login_required
-def before_request():
-    pass
-
-
-@bp.route('/<hashid:user_id>')
-def profile(user_id):
-    user = User.query.get_or_404(user_id)
-    if not user.is_public and user != current_user:
-        abort(403)
-    return render_template(
-        'profile/profile.html.j2', 
-        user=user.to_json_serializeable()
-    )
-
-
-@bp.route('/<hashid:user_id>/avatar')
-def profile_avatar(user_id):
-    user = User.query.get_or_404(user_id)
-    if user.avatar is None:
-        abort(404)
-    if not user.is_public and not (user == current_user or current_user.is_administrator()):
-        abort(403)
-    return send_from_directory(
-        os.path.dirname(user.avatar.path),
-        os.path.basename(user.avatar.path),
-        as_attachment=True,
-        attachment_filename=user.avatar.filename,
-        mimetype=user.avatar.mimetype
-    )
-
-
-@bp.route('/<hashid:user_id>/avatar', methods=['DELETE'])
-def delete_profile_avatar(user_id):
-    def _delete_avatar(app, avatar_id):
-        with app.app_context():
-            avatar = Avatar.query.get(avatar_id)
-            avatar.delete()
-            db.session.commit()
-
-    user = User.query.get_or_404(user_id)
-    if user.avatar is None:
-        abort(404)
-    thread = Thread(
-        target=_delete_avatar,
-        args=(current_app._get_current_object(), user.avatar.id)
-    )
-    thread.start()
-    return {}, 202
-
-
-@bp.route('/<hashid:user_id>/edit', methods=['GET', 'POST'])
-def edit_profile(user_id):
-    user = User.query.get_or_404(user_id)
-    edit_profile_settings_form = EditProfileSettingsForm(
-        current_user,
-        data=current_user.to_json_serializeable(),
-        prefix='edit-profile-settings-form'
-    )
-    edit_privacy_settings_form = EditPrivacySettingsForm(
-        data=current_user.to_json_serializeable(),
-        prefix='edit-privacy-settings-form'
-    )
-    edit_public_profile_information_form = EditPublicProfileInformationForm(
-        data=current_user.to_json_serializeable(),
-        prefix='edit-public-profile-information-form'
-    )
-    if edit_profile_settings_form.validate_on_submit():
-        current_user.email = edit_profile_settings_form.email.data
-        current_user.username = edit_profile_settings_form.username.data
-        db.session.commit()
-        flash('Profile settings updated')
-        return redirect(url_for('.profile', user_id=user.id))
-    if edit_privacy_settings_form.submit.data and edit_privacy_settings_form.validate():
-        current_user.is_public = edit_privacy_settings_form.is_public.data
-        if edit_privacy_settings_form.show_email.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
-        else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
-        if edit_privacy_settings_form.show_last_seen.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
-        else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
-        if edit_privacy_settings_form.show_member_since.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
-        else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
-        db.session.commit()
-        flash('Your changes have been saved')
-        return redirect(url_for('.profile', user_id=user.id))
-    if edit_public_profile_information_form.validate_on_submit():
-        if edit_public_profile_information_form.avatar.data:
-            try:
-                Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user)
-            except (AttributeError, OSError):
-                abort(500)
-        current_user.about_me = edit_public_profile_information_form.about_me.data
-        current_user.location = edit_public_profile_information_form.location.data
-        current_user.organization = edit_public_profile_information_form.organization.data
-        current_user.website = edit_public_profile_information_form.website.data
-        current_user.full_name = edit_public_profile_information_form.full_name.data
-        db.session.commit()
-        flash('Profile settings updated')
-        return redirect(url_for('.profile', user_id=user.id))
-    return render_template(
-        'profile/edit_profile.html.j2',
-        edit_profile_settings_form=edit_profile_settings_form,
-        edit_privacy_settings_form=edit_privacy_settings_form,
-        edit_public_profile_information_form=edit_public_profile_information_form,
-        user=user,
-        title='Edit Profile'
-    )

app/static/js/RessourceLists/PublicUserList.js

@@ -34,7 +34,7 @@ class PublicUserList extends RessourceList {
       return {
         'id': user.id,
         'member-since': user.member_since,
-        'avatar': user.avatar ? `/profile/${user.id}/avatar` : '/static/images/user_avatar.png',
+        'avatar': user.avatar ? `/users/${user.id}/avatar` : '/static/images/user_avatar.png',
         'username': user.username,
         'full-name': user.full_name ? user.full_name : '',
         'location': user.location ? user.location : '',
@@ -85,7 +85,7 @@ class PublicUserList extends RessourceList {
     let publicUserId = publicUserElement.dataset.id;
     switch (action) {
       case 'view': {
-        window.location.href = `/profile/${publicUserId}`;
+        window.location.href = `/users/${publicUserId}`;
         break;
       }
       default: {

app/static/js/Utils.js

@@ -257,7 +257,7 @@ class Utils {
 
       let confirmElement = modalElement.querySelector('.action-button[data-action="confirm"]');
       confirmElement.addEventListener('click', (event) => {
-        fetch(`/profile/${userId}/avatar`, {method: 'DELETE', headers: {Accept: 'application/json'}})
+        fetch(`/users/${userId}/avatar`, {method: 'DELETE', headers: {Accept: 'application/json'}})
           .then(
             (response) => {
               if (response.status === 403) {app.flash('Forbidden', 'error'); reject(response);}

app/templates/_navbar.html.j2

@@ -30,7 +30,7 @@
   <li><a href="{{ url_for('main.user_manual') }}"><i class="material-icons left">help</i>Manual</a></li>
   {% if current_user.is_authenticated %}
   <li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>General settings</a></li>
-  <li><a href="{{ url_for('profile.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
+  <li><a href="{{ url_for('users.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
   <li class="divider" tabindex="-1"></li>
   <li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
   {% else %}

app/templates/_sidenav.html.j2

@@ -4,7 +4,7 @@
       <div class="background primary-color"></div>
       <div class="row">
         <div class="col s2">
-          <a href="{{ url_for('profile.profile', user_id=current_user.id) }}">
+          <a href="{{ url_for('users.user', user_id=current_user.id) }}">
           <i class="material-icons" style="color:white; font-size:3em; margin-top: 25px; margin-left:-15px;">account_circle</i></div>
           </a>
         <div class="col s10">
@@ -34,7 +34,7 @@
   <li><div class="divider"></div></li>
   <li><a class="subheader">Account</a></li>
   <li><a href="{{ url_for('settings.settings') }}"><i class="material-icons">settings</i>General Settings</a></li>
-  <li><a href="{{ url_for('profile.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
+  <li><a href="{{ url_for('users.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
   <li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
   {% if current_user.can(Permission.ADMINISTRATE) or current_user.can(Permission.USE_API) %}
   <li><div class="divider"></div></li>

app/templates/users/profile.html.j2

@@ -13,7 +13,7 @@
                 <br>
                 <br>
                 {% if user.avatar %}
-                <img src="/profile/{{ user.id }}/avatar" alt="user-image" class="circle responsive-img">
+                <img src="{{ url_for('.profile_avatar', user_id=user_id) }}" alt="user-image" class="circle responsive-img">
                 {% else %}
                 <img src="{{ url_for('static', filename='images/user_avatar.png') }}" alt="user-image" class="circle responsive-img">
                 {% endif %}

app/users/routes.py

@@ -1,16 +1,41 @@
-from flask import abort, current_app
+from flask import (
+    abort,
+    current_app,
+    flash, 
+    Markup, 
+    redirect, 
+    render_template, 
+    send_from_directory,
+    url_for
+)
 from flask_login import current_user, login_required
 from threading import Thread
+import os
 from app import db
-from app.models import User
+from app.models import Avatar, ProfilePrivacySettings, User
 from . import bp
+from .forms import (
+  EditPrivacySettingsForm,
+  EditProfileSettingsForm,
+  EditPublicProfileInformationForm
+)
 
+@bp.before_request
+@login_required
+def before_request():
+    pass
 
 @bp.route('/<hashid:user_id>')
 @login_required
 def user(user_id):
-    abort(503)
-
+    user = User.query.get_or_404(user_id)
+    if not user.is_public and user != current_user:
+        abort(403)
+    return render_template(
+        'users/profile.html.j2', 
+        user=user.to_json_serializeable(),
+        user_id=user_id
+    )
 
 @bp.route('/<hashid:user_id>', methods=['DELETE'])
 @login_required
@@ -30,3 +55,114 @@ def delete_user(user_id):
     )
     thread.start()
     return {}, 202
+
+@bp.route('/<hashid:user_id>')
+def profile(user_id):
+    user = User.query.get_or_404(user_id)
+    if not user.is_public and user != current_user:
+        abort(403)
+    return render_template(
+        'users/profile.html.j2', 
+        user=user.to_json_serializeable(),
+        user_id=user_id
+    )
+
+
+@bp.route('/<hashid:user_id>/avatar')
+def profile_avatar(user_id):
+    user = User.query.get_or_404(user_id)
+    if user.avatar is None:
+        abort(404)
+    if not user.is_public and not (user == current_user or current_user.is_administrator()):
+        abort(403)
+    return send_from_directory(
+        os.path.dirname(user.avatar.path),
+        os.path.basename(user.avatar.path),
+        as_attachment=True,
+        attachment_filename=user.avatar.filename,
+        mimetype=user.avatar.mimetype
+    )
+
+
+@bp.route('/<hashid:user_id>/avatar', methods=['DELETE'])
+def delete_profile_avatar(user_id):
+    def _delete_avatar(app, avatar_id):
+        with app.app_context():
+            avatar = Avatar.query.get(avatar_id)
+            avatar.delete()
+            db.session.commit()
+
+    user = User.query.get_or_404(user_id)
+    if user.avatar is None:
+        abort(404)
+    thread = Thread(
+        target=_delete_avatar,
+        args=(current_app._get_current_object(), user.avatar.id)
+    )
+    thread.start()
+    return {}, 202
+
+
+@bp.route('/<hashid:user_id>/edit', methods=['GET', 'POST'])
+def edit_profile(user_id):
+    user = User.query.get_or_404(user_id)
+    if not (user == current_user or current_user.is_administrator()):
+        abort(403)
+    edit_profile_settings_form = EditProfileSettingsForm(
+        current_user,
+        data=current_user.to_json_serializeable(),
+        prefix='edit-profile-settings-form'
+    )
+    edit_privacy_settings_form = EditPrivacySettingsForm(
+        data=current_user.to_json_serializeable(),
+        prefix='edit-privacy-settings-form'
+    )
+    edit_public_profile_information_form = EditPublicProfileInformationForm(
+        data=current_user.to_json_serializeable(),
+        prefix='edit-public-profile-information-form'
+    )
+    if edit_profile_settings_form.validate_on_submit():
+        current_user.email = edit_profile_settings_form.email.data
+        current_user.username = edit_profile_settings_form.username.data
+        db.session.commit()
+        flash('Profile settings updated')
+        return redirect(url_for('.user', user_id=user.id))
+    if edit_privacy_settings_form.submit.data and edit_privacy_settings_form.validate():
+        current_user.is_public = edit_privacy_settings_form.is_public.data
+        if edit_privacy_settings_form.show_email.data:
+            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
+        else:
+            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
+        if edit_privacy_settings_form.show_last_seen.data:
+            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
+        else:
+            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
+        if edit_privacy_settings_form.show_member_since.data:
+            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
+        else:
+            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.user', user_id=user.id))
+    if edit_public_profile_information_form.validate_on_submit():
+        if edit_public_profile_information_form.avatar.data:
+            try:
+                Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user)
+            except (AttributeError, OSError):
+                abort(500)
+        current_user.about_me = edit_public_profile_information_form.about_me.data
+        current_user.location = edit_public_profile_information_form.location.data
+        current_user.organization = edit_public_profile_information_form.organization.data
+        current_user.website = edit_public_profile_information_form.website.data
+        current_user.full_name = edit_public_profile_information_form.full_name.data
+        db.session.commit()
+        flash('Profile settings updated')
+        return redirect(url_for('.user', user_id=user.id))
+    return render_template(
+        'users/edit_profile.html.j2',
+        edit_profile_settings_form=edit_profile_settings_form,
+        edit_privacy_settings_form=edit_privacy_settings_form,
+        edit_public_profile_information_form=edit_public_profile_information_form,
+        user=user,
+        title='Edit Profile'
+    )