diff --git a/.gitignore b/.gitignore index adff376..536ff9a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ config.py logfile.log db_repository/* +upload/avatar/* tmp/* diff --git a/app/models.py b/app/models.py index b0c3012..8203a73 100644 --- a/app/models.py +++ b/app/models.py @@ -35,9 +35,10 @@ class User(db.Model): firstname = db.Column(db.String(64)) lastname = db.Column(db.String(64)) email = db.Column(db.String(128)) + avatar = db.Column(db.String(128)) role_id = db.Column(db.Integer, db.ForeignKey('role.id')) - def __init__(self, id=None, username=None, password=None, plain_text_password=None, firstname=None, lastname=None, role_id=None, email=None, reload_info=True): + def __init__(self, id=None, username=None, password=None, plain_text_password=None, firstname=None, lastname=None, role_id=None, email=None, avatar=None, reload_info=True): self.id = id self.username = username self.password = password @@ -46,6 +47,7 @@ class User(db.Model): self.lastname = lastname self.role_id = role_id self.email = email + self.avatar = avatar if reload_info: user_info = self.get_user_info_by_id() if id else self.get_user_info_by_username() @@ -238,6 +240,8 @@ class User(db.Model): user.email = self.email if self.plain_text_password: user.password = self.get_hashed_password(self.plain_text_password) + if self.avatar: + user.avatar = self.avatar try: db.session.commit() diff --git a/app/static/admin/pages/scripts/user_profile.js b/app/static/admin/pages/scripts/user_profile.js new file mode 100644 index 0000000..58307d3 --- /dev/null +++ b/app/static/admin/pages/scripts/user_profile.js @@ -0,0 +1,54 @@ +var UserProfile = function() { + var handleUpdatePassword = function() { + $('.password-form').validate({ + errorElement: 'span', //default input error message container + errorClass: 'help-block', // default input error message class + focusInvalid: false, // do not focus the last invalid input + ignore: "", + rules: { + password: { + required: true + }, + rpassword: { + equalTo: "#newpassword" + }, + }, + + invalidHandler: function(event, validator) { //display error alert on form submit + + }, + + highlight: function(element) { // hightlight error inputs + $(element) + .closest('.form-group').addClass('has-error'); // set error class to the control group + }, + + success: function(label) { + label.closest('.form-group').removeClass('has-error'); + label.remove(); + }, + + submitHandler: function(form) { + form.submit(); + } + }); + + $('.password-form input').keypress(function(e) { + if (e.which == 13) { + if ($('.password-form').validate().form()) { + $('.password-form').submit(); + } + return false; + } + }); + } + + return { + //main function to initiate the module + init: function() { + handleUpdatePassword(); + } + + }; + +}(); \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index 9b5415a..a84b053 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -98,7 +98,11 @@
  • + {% if current_user.avatar %} + + {% else %} + {% endif %} {% if current_user.is_authenticated() %} {{ current_user.firstname }} {% endif %} diff --git a/app/templates/user_profile.html b/app/templates/user_profile.html index 42dea25..0df3d85 100644 --- a/app/templates/user_profile.html +++ b/app/templates/user_profile.html @@ -91,13 +91,15 @@
    -
    +
    -
    - -
    -
    +
    + {% if current_user.avatar %} + + {% else %} + + {% endif %}
    NOTE! - Attached image thumbnail is supported in Latest Firefox, Chrome, Opera, Safari and Internet Explorer 10 only +  Only support .PNG, .JPG, .JPEG. Best size is 200x200.
    - - Submit - - Cancel +
    @@ -130,23 +129,17 @@ {% if not current_user.password %} Your account password is managed via LDAP which isn't supported to change here. {% else %} -
    -
    - - -
    +
    - +
    - +
    - - Cancel
    {% endif %} @@ -167,18 +160,19 @@ {{ super() }} - - + + diff --git a/app/views.py b/app/views.py index 883e746..c0f5ac6 100644 --- a/app/views.py +++ b/app/views.py @@ -1,10 +1,12 @@ +import os import json import jinja2 import traceback from functools import wraps from flask.ext.login import login_user, logout_user, current_user, login_required -from flask import Flask, g, request, make_response, jsonify, render_template, session, redirect, url_for, flash +from flask import Flask, g, request, make_response, jsonify, render_template, session, redirect, url_for, send_from_directory +from werkzeug import secure_filename from lib import utils from app import app, login_manager @@ -403,15 +405,37 @@ def user_profile(): if request.method == 'GET': return render_template('user_profile.html') if request.method == 'POST': + # get new profile info firstname = request.form['firstname'] if 'firstname' in request.form else '' lastname = request.form['lastname'] if 'lastname' in request.form else '' email = request.form['email'] if 'email' in request.form else '' - new_password = request.form['newpassword'] if 'newpassword' in request.form else '' + new_password = request.form['password'] if 'password' in request.form else '' - user = User(username=current_user.username, plain_text_password=new_password, firstname=firstname, lastname=lastname, email=email, reload_info=False) + # get new avatar + save_file_name = None + if 'file' in request.files: + file = request.files['file'] + if file: + filename = secure_filename(file.filename) + file_extension = filename.rsplit('.', 1)[1] + + if file_extension.lower() in ['jpg', 'jpeg', 'png']: + save_file_name = current_user.username + '.' + file_extension + file.save(os.path.join(app.config['UPLOAD_DIR'], 'avatar', save_file_name)) + + + # update user profile + user = User(username=current_user.username, plain_text_password=new_password, firstname=firstname, lastname=lastname, email=email, avatar=save_file_name, reload_info=False) user.update_profile() + return render_template('user_profile.html') + +@app.route('/user/avatar/') +def user_avatar(filename): + return send_from_directory(os.path.join(app.config['UPLOAD_DIR'], 'avatar'), filename) + + @app.route('/', methods=['GET', 'POST']) @login_required def index(): diff --git a/config_template.py b/config_template.py index c6dbbf9..9ad6ff5 100644 --- a/config_template.py +++ b/config_template.py @@ -10,6 +10,9 @@ PORT = 9393 LOG_LEVEL = 'DEBUG' LOG_FILE = 'logfile.log' +# Upload +UPLOAD_DIR = os.path.join(basedir, 'upload') + # DATABASE CONFIG SQLALCHEMY_DATABASE_URI = 'mysql://root:123456@192.168.59.103/pdns' SQLALCHEMY_MIGRATE_REPO = os.path.join(basedir, 'db_repository') diff --git a/upload/avatar/.gitignore b/upload/avatar/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/upload/avatar/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore