Profile page

app/settings/forms.py

@@ -48,7 +48,7 @@ class ChangePasswordForm(FlaskForm):
             raise ValidationError('Invalid password')
 
 
-class EditGeneralSettingsForm(FlaskForm):
+class EditProfileSettingsForm(FlaskForm):
     user_avatar = FileField(
         'Image File'
     )
@@ -74,7 +74,7 @@ class EditGeneralSettingsForm(FlaskForm):
         'Full name',
         validators=[Length(max=128)]
     )
-    bio = TextAreaField(
+    about_me = TextAreaField(
         'About me', 
         validators=[
             Length(max=254)
@@ -101,10 +101,6 @@ class EditGeneralSettingsForm(FlaskForm):
 
     submit = SubmitField()
 
-    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!')
-
     def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
@@ -118,6 +114,10 @@ class EditGeneralSettingsForm(FlaskForm):
         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):

app/settings/routes.py

@@ -5,7 +5,6 @@ from app.models import UserSettingJobStatusMailNotificationLevel
 from . import bp
 from .forms import (
     ChangePasswordForm,
-    EditGeneralSettingsForm,
     EditNotificationSettingsForm,
     EditPrivacySettingsForm
 )
@@ -18,11 +17,6 @@ def settings():
         current_user,
         prefix='change-password-form'
     )
-    edit_general_settings_form = EditGeneralSettingsForm(
-        current_user,
-        data=current_user.to_json_serializeable(),
-        prefix='edit-general-settings-form'
-    )
     edit_notification_settings_form = EditNotificationSettingsForm(
         data=current_user.to_json_serializeable(),
         prefix='edit-notification-settings-form'
@@ -36,13 +30,7 @@ def settings():
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.index'))
-    if (edit_general_settings_form.submit.data
-            and edit_general_settings_form.validate()):
-        current_user.email = edit_general_settings_form.email.data
-        current_user.username = edit_general_settings_form.username.data
-        db.session.commit()
-        flash('Your changes have been saved')
-        return redirect(url_for('.settings'))
+    
     if (edit_notification_settings_form.submit.data
             and edit_notification_settings_form.validate()):
         current_user.setting_job_status_mail_notification_level = (
@@ -53,13 +41,10 @@ def settings():
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.settings'))
-    user_image = 'static/images/user_avatar.png'
     return render_template(
         'settings/settings.html.j2',
         change_password_form=change_password_form,
-        edit_general_settings_form=edit_general_settings_form,
         edit_notification_settings_form=edit_notification_settings_form,
         edit_privacy_settings_form=edit_privacy_settings_form,
-        user_image=user_image,
-        title='Profile & Settings'
+        title='Settings'
     )