diff --git a/app/admin/routes.py b/app/admin/routes.py index 90d9034d..2f50b999 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -5,9 +5,9 @@ from app import db, hashids from app.decorators import admin_required from app.models import Role, User, UserSettingJobStatusMailNotificationLevel from app.settings.forms import ( - EditProfileSettingsForm, EditNotificationSettingsForm ) +from app.profile.forms import EditProfileSettingsForm from . import bp from .forms import AdminEditUserForm diff --git a/app/models.py b/app/models.py index 1e2cfb32..7927c81f 100644 --- a/app/models.py +++ b/app/models.py @@ -244,7 +244,17 @@ class Token(db.Model): yesterday = datetime.utcnow() - timedelta(days=1) Token.query.filter(Token.refresh_expiration < yesterday).delete() - +class Avatar(HashidMixin, FileMixin, db.Model): + __tablename__ = 'avatars' + # Primary key + id = db.Column(db.Integer, primary_key=True) + # Foreign keys + user_id = db.Column(db.Integer, db.ForeignKey('users.id')) + + @property + def path(self): + return os.path.join(self.user.path, 'avatar') + class User(HashidMixin, UserMixin, db.Model): __tablename__ = 'users' # Primary key @@ -269,6 +279,12 @@ class User(HashidMixin, UserMixin, db.Model): organization = db.Column(db.String(128)) # Backrefs: role: Role # Relationships + avatar = db.relationship( + 'Avatar', + backref='user', + cascade='all, delete-orphan', + uselist=False + ) tesseract_ocr_pipeline_models = db.relationship( 'TesseractOCRPipelineModel', backref='user', @@ -299,7 +315,7 @@ class User(HashidMixin, UserMixin, db.Model): cascade='all, delete-orphan', lazy='dynamic' ) - + def __init__(self, **kwargs): super().__init__(**kwargs) if self.role is not None: @@ -497,6 +513,11 @@ class User(HashidMixin, UserMixin, db.Model): ), 'member_since': f'{self.member_since.isoformat()}Z', 'username': self.username, + 'full_name': self.full_name, + 'about_me': self.about_me, + 'website': self.website, + 'location': self.location, + 'organization': self.organization, 'job_status_mail_notification_level': \ self.setting_job_status_mail_notification_level.name } diff --git a/app/profile/forms.py b/app/profile/forms.py index bcb9daf9..20bd4ad4 100644 --- a/app/profile/forms.py +++ b/app/profile/forms.py @@ -16,7 +16,7 @@ from app.models import User from app.auth import USERNAME_REGEX class EditProfileSettingsForm(FlaskForm): - user_avatar = FileField( + avatar = FileField( 'Image File' ) email = StringField( diff --git a/app/profile/routes.py b/app/profile/routes.py index 8001ddb4..4702dcb7 100644 --- a/app/profile/routes.py +++ b/app/profile/routes.py @@ -1,51 +1,60 @@ -from flask import flash, redirect, render_template, url_for +from flask import ( + abort, + flash, + Markup, + redirect, + render_template, + send_from_directory, + url_for +) from flask_login import current_user, login_required +import os from app import db -from app.models import User +from app.models import Avatar, User from . import bp from .forms import ( EditProfileSettingsForm ) -@bp.route('') +@bp.before_request @login_required -def profile(): - user_image = 'static/images/user_avatar.png' - user_name = current_user.username - last_seen = f'{current_user.last_seen.strftime("%Y-%m-%d %H:%M")}' - location = 'Bielefeld' - about_me = '''Lorem ipsum dolor sit amet, consetetur sadipscing elitr, - sed diam nonumy eirmod tempor invidunt ut labore et dolore - magna aliquyam erat, sed diam voluptua. At vero eos et accusam - et justo duo dolores et ea rebum. Stet clita kasd gubergren, - no sea takimat''' - full_name = 'Inga Kirschnick' - email = current_user.email - website = 'https://nopaque.uni-bielefeld.de' - organization = 'Universität Bielefeld' - member_since = f'{current_user.member_since.strftime("%Y-%m-%d")}' - return render_template('profile/profile_page.html.j2', - user_image=user_image, - user_name=user_name, - last_seen=last_seen, - location=location, - about_me=about_me, - full_name=full_name, - email=email, - website=website, - organization=organization, - member_since=member_since) +def before_request(): + pass -@bp.route('/edit') -@login_required -def edit_profile(): - edit_profile_settings_form = EditProfileSettingsForm( + +@bp.route('/') +def profile(user_id): + user = User.query.get_or_404(user_id) + return render_template('profile/profile_page.html.j2', + user=user) + +@bp.route('//avatars/') +def avatar_download(user_id, avatar_id): + avatar_file = Avatar.query.filter_by(user_id = user_id, id = avatar_id).first_or_404() + if not (avatar_file and avatar_file.filename): + abort(404) + return send_from_directory( + os.path.dirname(avatar_file.path), + os.path.basename(avatar_file.path), + as_attachment=True, + attachment_filename=avatar_file.filename, + mimetype=avatar_file.mimetype + ) + +@bp.route('//edit-profile', 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' - ) - if (edit_profile_settings_form.submit.data - and edit_profile_settings_form.validate()): + ) + if edit_profile_settings_form.validate_on_submit(): + if edit_profile_settings_form.avatar.data: + try: + Avatar.create(edit_profile_settings_form.avatar.data, user=current_user) + except (AttributeError, OSError): + abort(500) current_user.email = edit_profile_settings_form.email.data current_user.username = edit_profile_settings_form.username.data current_user.about_me = edit_profile_settings_form.about_me.data @@ -54,8 +63,10 @@ def edit_profile(): current_user.website = edit_profile_settings_form.website.data current_user.full_name = edit_profile_settings_form.full_name.data db.session.commit() - flash('Your changes have been saved') - return redirect(url_for('.profile.edit_profile')) - return render_template('profile/edit_profile.html.j2', - edit_profile_settings_form=edit_profile_settings_form, - title='Edit Profile') + message = Markup(f'Profile settings updated') + flash(message, 'success') + 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, + user=user, + title='Edit Profile') diff --git a/app/settings/forms.py b/app/settings/forms.py index 25bb5f1f..335f73d3 100644 --- a/app/settings/forms.py +++ b/app/settings/forms.py @@ -47,79 +47,6 @@ class ChangePasswordForm(FlaskForm): if not self.user.verify_password(field.data): raise ValidationError('Invalid password') - -class EditProfileSettingsForm(FlaskForm): - user_avatar = FileField( - 'Image File' - ) - email = StringField( - 'E-Mail', - validators=[InputRequired(), Length(max=254), Email()] - ) - username = StringField( - 'Username', - validators=[ - InputRequired(), - Length(max=64), - Regexp( - USERNAME_REGEX, - message=( - 'Usernames must have only letters, numbers, dots or ' - 'underscores' - ) - ) - ] - ) - full_name = StringField( - 'Full name', - validators=[Length(max=128)] - ) - about_me = TextAreaField( - 'About me', - validators=[ - Length(max=254) - ] - ) - website = StringField( - 'Website', - validators=[ - Length(max=254) - ] - ) - organization = StringField( - 'Organization', - validators=[ - Length(max=128) - ] - ) - location = StringField( - 'Location', - validators=[ - Length(max=128) - ] - ) - - submit = SubmitField() - - def __init__(self, user, *args, **kwargs): - super().__init__(*args, **kwargs) - self.user = user - - def validate_email(self, field): - if (field.data != self.user.email - and User.query.filter_by(email=field.data).first()): - raise ValidationError('Email already registered') - - def validate_username(self, field): - if (field.data != self.user.username - and User.query.filter_by(username=field.data).first()): - raise ValidationError('Username already in use') - - def validate_image_file(self, field): - if not field.data.filename.lower().endswith('.jpg' or '.png' or '.jpeg'): - raise ValidationError('only .jpg, .png and .jpeg!') - - class EditNotificationSettingsForm(FlaskForm): job_status_mail_notification_level = SelectField( 'Job status mail notification level', @@ -136,7 +63,14 @@ class EditNotificationSettingsForm(FlaskForm): ] class EditPrivacySettingsForm(FlaskForm): - public_profile = BooleanField( - 'Public profile' + private_profile = BooleanField( + 'Private profile' ) + private_email = BooleanField( + 'Private email' + ) + only_username = BooleanField( + 'Show only username' + ) + submit = SubmitField() diff --git a/app/static/js/RessourceLists/PublicCorporaList.js b/app/static/js/RessourceLists/PublicCorporaList.js new file mode 100644 index 00000000..2171396e --- /dev/null +++ b/app/static/js/RessourceLists/PublicCorporaList.js @@ -0,0 +1,70 @@ +class PublicCorporaList extends RessourceList { + static instances = []; + + static getInstance(elem) { + return PublicCorporaList.instances.find((instance) => { + return instance.listjs.list === elem; + }); + } + + static autoInit() { + for (let publicCorporaListElement of document.querySelectorAll('.public-corpora-list:not(.no-autoinit)')) { + new PublicCorporaList(publicCorporaListElement); + } + } + + static options = { + initialHtmlGenerator: (id) => { + return ` +
+ search + + +
+ + + + + + + + + + +
TitleDescription
+
    + `.trim(); + }, + item: ` + + book + + + + `.trim(), + ressourceMapper: (corpus) => { + return { + 'id': corpus.id, + 'creation-date': corpus.creation_date, + 'description': corpus.description, + 'title': corpus.title + }; + }, + sortArgs: ['creation-date', {order: 'desc'}], + valueNames: [ + {data: ['id']}, + {data: ['creation-date']}, + 'description', + 'title' + ] + }; + + constructor(listElement, options = {}) { + super(listElement, {...PublicCorporaList.options, ...options}); + PublicCorporaList.instances.push(this); + } + + init(user) { + this._init(user.corpora.is_public); + } +} diff --git a/app/static/js/RessourceLists/RessourceList.js b/app/static/js/RessourceLists/RessourceList.js index 871a1e2f..5af7a231 100644 --- a/app/static/js/RessourceLists/RessourceList.js +++ b/app/static/js/RessourceLists/RessourceList.js @@ -10,6 +10,7 @@ class RessourceList { JobList.autoInit(); JobInputList.autoInit(); JobResultList.autoInit(); + PublicCorporaList.autoInit(); SpaCyNLPPipelineModelList.autoInit(); TesseractOCRPipelineModelList.autoInit(); UserList.autoInit(); diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 index e2d4db64..d90118b8 100644 --- a/app/templates/_navbar.html.j2 +++ b/app/templates/_navbar.html.j2 @@ -29,7 +29,8 @@
    • helpManual
      • {% if current_user.is_authenticated %} -
    • settingsSettings
      • +
    • settingsGeneral settings
      • +
    • contact_pageProfile settings
    • Log out
      • {% else %} diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 index 7cc8a8f8..8ff90c33 100644 --- a/app/templates/_scripts.html.j2 +++ b/app/templates/_scripts.html.j2 @@ -24,6 +24,7 @@ 'js/RessourceLists/JobList.js', 'js/RessourceLists/JobInputList.js', 'js/RessourceLists/JobResultList.js', + 'js/RessourceLists/PublicCorporaList.js', 'js/RessourceLists/SpacyNLPPipelineModelList.js', 'js/RessourceLists/TesseractOCRPipelineModelList.js', 'js/RessourceLists/UserList.js' diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index f87f701e..1aff7f89 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -4,7 +4,7 @@
      - + account_circle
      @@ -14,12 +14,13 @@
      -
    • nopaque
      • + {#
    • nopaque
      • #}
    • emailNews
    • helpManual
    • dashboardDashboard
    • IMy Corpora
    • JMy Jobs
      • +
    • groupsSocial
    • new_labelContribute
    • Processes & Services
      • diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index ec03609d..e0354ea6 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -42,6 +42,25 @@ +
      +

      Social

      +
      +
      +
      + Other users and groups +

      Find other users and follow them to see their corpora and groups.

      +
      +
      +
      +
      +
      +
      + Public corpora +

      Find public corpora

      +
      +
      +
      +
      {% endblock page_content %} diff --git a/app/templates/profile/edit_profile.html.j2 b/app/templates/profile/edit_profile.html.j2 index 3a5ce381..1f4bd0e7 100644 --- a/app/templates/profile/edit_profile.html.j2 +++ b/app/templates/profile/edit_profile.html.j2 @@ -5,20 +5,33 @@
      -

      {{ title }}

      -
      +

      {{ title }}

      +
      +
      -
      - {{ edit_profile_settings_form.hidden_tag() }} -
      +
      +
      + {{ edit_profile_settings_form.hidden_tag() }}
      -
      -
      - user-image - {{wtf.render_field(edit_profile_settings_form.user_avatar, accept='image/*', class='file-path validate')}} +
      +
      +
      +
      + {% if current_user.avatar %} + user-image + {% else %} + user-image + {% endif %} +
      +
      +
      +
      +
      + {{wtf.render_field(edit_profile_settings_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder="Choose an image file")}} +
      +
      -
      {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }} {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }} @@ -35,8 +48,8 @@ {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }}
      -
      - + +
      diff --git a/app/templates/profile/profile_page.html.j2 b/app/templates/profile/profile_page.html.j2 index fd4648aa..dbcd78ca 100644 --- a/app/templates/profile/profile_page.html.j2 +++ b/app/templates/profile/profile_page.html.j2 @@ -9,27 +9,26 @@
      -
      - {% if about_me %} - user-image +
      + {% if user.avatar %} + user-image {% else %} - user-image + user-image {% endif %}
      -
      -

      {{ user_name }}

      -
      Last seen: {{ last_seen }}
      - {% if location %} -

      location_on{{ location }}

      +

      {{ user.username }}

      +
      Last seen: {{ user.last_seen.strftime('%Y-%m-%d %H:%M') }}
      + {% if user.location %} +

      location_on{{ user.location }}

      {% endif %}


      - {% if about_me%} + {% if user.about_me%}
      About me -

      {{ about_me }}

      +

      {{ user.about_me }}

      {% endif %} @@ -39,36 +38,38 @@
      - {% if full_name %} + {% if user.full_name %} - + {% endif %} - {% if email %} + {% if user.email %} - + {% endif %} - {% if website %} + {% if user.website %} - + {% endif %} - {% if organization %} + {% if user.organization %} - + {% endif %}
      person{{ full_name }} {{ user.full_name }}
      email{{ email }}{{ user.email }}
      laptop{{ website }}{{ user.website }}
      business{{ organization }}{{ user.organization }}

      -

      Member since: {{ member_since }}

      +

      Member since: {{ user.member_since.strftime('%Y-%m-%d') }}


      - Edit profile + {% if current_user.is_authenticated and current_user.id == user.id %} + Edit profile + {% endif %}
      @@ -77,9 +78,20 @@
      - +
      +
      +

      Groups

      +
      +
      +
      +
      +
      +
      +

      Public corpora

      +
      +
      +
      -
      {% endblock page_content %} diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2 index b33ab0a1..f272e63a 100644 --- a/app/templates/settings/settings.html.j2 +++ b/app/templates/settings/settings.html.j2 @@ -27,7 +27,13 @@
      Privacy settings - {{ wtf.render_field(edit_privacy_settings_form.public_profile) }} +
      + {{ wtf.render_field(edit_privacy_settings_form.private_profile) }} +
      + {{ wtf.render_field(edit_privacy_settings_form.private_email) }} +
      + {{ wtf.render_field(edit_privacy_settings_form.only_username) }} +
      diff --git a/migrations/versions/ef6a275f8079_.py b/migrations/versions/ef6a275f8079_.py new file mode 100644 index 00000000..56fc6469 --- /dev/null +++ b/migrations/versions/ef6a275f8079_.py @@ -0,0 +1,31 @@ +"""Add avatar table and conncect it to users + +Revision ID: ef6a275f8079 +Revises: 4820fa2e3ee2 +Create Date: 2022-12-01 14:23:22.688572 + +""" +from alembic import op +import sqlalchemy as sa + + +revision = 'ef6a275f8079' +down_revision = '4820fa2e3ee2' +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table('avatars', + sa.Column('creation_date', sa.DateTime(), nullable=True), + sa.Column('filename', sa.String(length=255), nullable=True), + sa.Column('mimetype', sa.String(length=255), nullable=True), + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), + sa.PrimaryKeyConstraint('id') + ) + + +def downgrade(): + op.drop_table('avatars') diff --git a/nopaque.py b/nopaque.py index cf1b1dec..6ecb2cf0 100644 --- a/nopaque.py +++ b/nopaque.py @@ -5,6 +5,7 @@ eventlet.monkey_patch() from app import cli, create_app, db, scheduler, socketio # noqa from app.models import ( + Avatar, Corpus, CorpusFile, Job, @@ -34,6 +35,7 @@ def make_context() -> Dict[str, Any]: def make_shell_context() -> Dict[str, Any]: ''' Adds variables to the shell context. ''' return { + 'Avatar': Avatar, 'Corpus': Corpus, 'CorpusFile': CorpusFile, 'db': db,