Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app.py

app.py

@@ -28,27 +28,6 @@ def inject_user():
     return dict(user=current_user)
 
 
-# Create a new route
-@app.route('/')
-def index():
-
-    if current_user.is_authenticated:
-        habits = current_user.get_habits()
-        name = "Hallo " + current_user.name
-    else:
-        habits = []
-        name = "Bitte melde dich an."
-
-    # habits = [("lesen", "eine Seite vor dem schlafen gehen"), ("sport", "3x Gym")]
-    return render_template(
-        'index.html',
-        title=name,
-        utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M %A"),
-        habits=habits,
-        errors={},
-    )
-
-
 @app.route('/login')
 @anonymous_required
 def login():
@@ -61,38 +40,6 @@ def signup():
     return render_template('auth/signup.html', errors={})
 
 
-@app.route('/signup', methods=['POST'])
-def signup_post():
-    email = request.form.get('email')
-    name = request.form.get('name')
-    password = request.form.get('password')
-
-    # Check for errors
-    errors = {}
-    if not email:
-        errors['email'] = 'Die E-Mail Adresse ist erforderlich.'
-    if not name:
-        errors['name'] = 'Der Name ist erforderlich.'
-    if not password:
-        errors['password'] = 'Das Passwort ist erforderlich.'
-
-    if errors:
-        return render_template(
-            'auth/signup.html',
-            email=email,
-            name=name,
-            password=password,
-            errors=errors
-        )
-
-    # Save user to database. Maybe log the user in directly.
-    user = User.create(name, email, password)
-    login_user(user)
-
-    # Redirect to login page
-    return redirect(url_for('index'))
-
-
 @app.route('/login', methods=['POST'])
 def login_post():
     email = request.form.get('email')
@@ -127,6 +74,38 @@ def login_post():
     return redirect(url_for('index'))
 
 
+@app.route('/signup', methods=['POST'])
+def signup_post():
+    email = request.form.get('email')
+    name = request.form.get('name')
+    password = request.form.get('password')
+
+    # Check for errors
+    errors = {}
+    if not email:
+        errors['email'] = 'Die E-Mail Adresse ist erforderlich.'
+    if not name:
+        errors['name'] = 'Der Name ist erforderlich.'
+    if not password:
+        errors['password'] = 'Das Passwort ist erforderlich.'
+
+    if errors:
+        return render_template(
+            'auth/signup.html',
+            email=email,
+            name=name,
+            password=password,
+            errors=errors
+        )
+
+    # Save user to database. Maybe log the user in directly.
+    user = User.create(name, email, password)
+    login_user(user)
+
+    # Redirect to login page
+    return redirect(url_for('index'))
+
+
 @app.route('/logout')
 @login_required
 def logout():
@@ -136,6 +115,27 @@ def logout():
     return redirect(url_for('index'))
 
 
+# Create a new route
+@app.route('/')
+def index():
+
+    if current_user.is_authenticated:
+        habits = current_user.get_habits()
+        name = "Hallo " + current_user.name
+    else:
+        habits = []
+        name = "Bitte melde dich an, du Vollhorst."
+
+    # habits = [("lesen", "eine Seite vor dem Schlafen gehen"), ("sport", "3x Gym")]
+    return render_template(
+        'index.html',
+        title=name,
+        utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M %A"),
+        habits=habits,
+        errors={},
+    )
+
+
 @app.route('/habit')
 @login_required
 def habit_creation():