diff --git a/.gitignore b/.gitignore index 9823b10..7ce219a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ src/ENV -src/database.sqlite +log.err +log.info diff --git a/src/app.py b/src/app.py index 388f96d..278091a 100644 --- a/src/app.py +++ b/src/app.py @@ -5,6 +5,7 @@ from markdown import markdown from database import db, User, Note app = Flask(__name__) +app.secret_key = 'secret' def login_required(f): @@ -26,7 +27,9 @@ def index(data=None): @app.route('/login', methods=['POST']) def login(): data = dict() - if request.form['action'] and request.form['email'] and request.form['password']: + if (request.form['action'] and + request.form['email'] and + request.form['password']): data['email'] = request.form['email'] data['password'] = request.form['password'] if request.form['action'] == 'signup': @@ -38,7 +41,10 @@ def login(): # Create my_user = User(data['email'], data['password']) db.session.add(my_user) - db.session.commit() + try: + db.session.commit() + except: + db.session.rollback() else: data['error'] = 'register' @@ -104,7 +110,8 @@ def search(): return dashboard(Note.query.filter( or_(Note.title.like('%' + q + '%'), Note.text.like('%' + q + '%') - )).filter_by(user_id=session['user_id']).order_by(Note.id.desc()).all()) + )).filter_by(user_id=session['user_id']).order_by( + Note.id.desc()).all()) @app.route('/new') @@ -120,7 +127,10 @@ def save_note(): 'text'], session['user_id']) # Create db.session.add(myNote) - db.session.commit() + try: + db.session.commit() + except: + db.session.rollback() return redirect(url_for('dashboard')) @@ -143,7 +153,10 @@ def edit_note(data=None): my_note = Note.query.filter_by(id=request.form['id']).first() my_note.title = request.form['title'] my_note.text = request.form['text'] - db.session.commit() + try: + db.session.commit() + except: + db.session.rollback() return redirect(url_for('dashboard')) @@ -167,12 +180,9 @@ def delete_note(): # Delete my_note = Note.query.filter_by(id=id).first() db.session.delete(my_note) - db.session.commit() + try: + db.session.commit() + except: + db.session.rollback() return redirect(url_for('dashboard', id=id)) - -# App -if __name__ == "__main__": - app.secret_key = 'secret' - app.debug = True - app.run() diff --git a/src/database.sqlite b/src/database.sqlite new file mode 100644 index 0000000..ca8a11b Binary files /dev/null and b/src/database.sqlite differ diff --git a/src/templates/layouts/master.html b/src/templates/layouts/master.html index 7ec88c5..3e91b16 100644 --- a/src/templates/layouts/master.html +++ b/src/templates/layouts/master.html @@ -18,5 +18,25 @@ {% endblock %} + + diff --git a/src/wsgi.py b/src/wsgi.py new file mode 100644 index 0000000..3239d41 --- /dev/null +++ b/src/wsgi.py @@ -0,0 +1,5 @@ +from app import app + +if __name__ == "__main__": + app.secret_key = 'secret' + app.run()