diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..440153d --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/app.py b/app.py index 8feca37..2dcd29d 100644 --- a/app.py +++ b/app.py @@ -12,6 +12,15 @@ def index(): # return 'Hello World' return render_template('index.html', title='Home', utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M:%S")) +@app.route('/login') +def login(): + return 'Login' + + +@app.route('/signup') +def signup(): + return 'Sign-Up' + # Run the application if __name__ == '__main__': diff --git a/app2.py b/app2.py index 990ce35..f195038 100644 --- a/app2.py +++ b/app2.py @@ -1,9 +1,8 @@ import datetime -from flask import Flask, render_template +from flask import Flask, render_template, redirect, url_for, request from flask_login import login_required, LoginManager -import auth from models.User import User # Create a new Flask instance @@ -21,14 +20,37 @@ def index(): def secret(): return 'Pssst!' +@app.route('/login') +def login(): + return render_template('auth/login.html') -app.register_blueprint(auth.auth) + +@app.route('/signup') +def signup(): + return render_template('auth/signup.html') + +@app.route('/signup', methods=['POST']) +def signup_post(): + email = request.form.get('email') + name = request.form.get('name') + password = request.form.get('password') + + # Save user to database. Maybe log the user in directly. + + return redirect(url_for('login')) + + +@app.route('/logout') +@login_required +def logout(): + # Log out functionality + return redirect(url_for('index')) # Run the application if __name__ == '__main__': login_manager = LoginManager() - login_manager.login_view = 'auth.login' + login_manager.login_view = 'login' login_manager.init_app(app) app.secret_key = 'PSSSSSHHHT!' diff --git a/auth.py b/auth.py deleted file mode 100644 index e0a74c6..0000000 --- a/auth.py +++ /dev/null @@ -1,30 +0,0 @@ -from flask import Blueprint, render_template, redirect, url_for, request -from flask_login import login_required - -auth = Blueprint('auth', __name__) - -@auth.route('/login') -def login(): - return render_template('auth/login.html') - - -@auth.route('/signup') -def signup(): - return render_template('auth/signup.html') - -@auth.route('/signup', methods=['POST']) -def signup_post(): - email = request.form.get('email') - name = request.form.get('name') - password = request.form.get('password') - - # Save user to database. Maybe log the user in directly. - - return redirect(url_for('auth.login')) - - -@auth.route('/logout') -@login_required -def logout(): - # Log out functionality - return redirect(url_for('main.index')) \ No newline at end of file diff --git a/templates/layouts/main.html b/templates/layouts/main.html index fa5931a..861050d 100644 --- a/templates/layouts/main.html +++ b/templates/layouts/main.html @@ -6,50 +6,55 @@ {{ title }} - HabitTracker - + -
{% block content %} {% endblock %} - - + + +
\ No newline at end of file