Merge branch 'demo'

.gitignore

@@ -1,2 +1,3 @@
 src/ENV
-src/database.sqlite
+log.err
+log.info

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()

src/templates/layouts/master.html

@@ -18,5 +18,25 @@
         {% endblock %}
       </div>
     </div>
+<footer>
+	<p>&nbsp;</p>
+        <p class="text-center">
+		Author: Andros Fenollosa <a href="https://programadorwebvalencia.com">https://programadorwebvalencia.com</a>
+	</p>
+        <p class="text-center">
+		Source: <a href="http://github.com/tanrax/flask-note">http://github.com/tanrax/flask-note</a>
+	</p>
+
+</footer>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-46470654-2', 'auto');
+  ga('send', 'pageview');
+
+</script>
   </body>
 </html>

src/wsgi.py

@@ -0,0 +1,5 @@
+from app import app
+
+if __name__ == "__main__":
+    app.secret_key = 'secret'
+    app.run()