diff --git a/app/forms.py b/app/forms.py index be498df..6f3d5ee 100644 --- a/app/forms.py +++ b/app/forms.py @@ -1,10 +1,30 @@ from flask_wtf import FlaskForm from wtforms import StringField, PasswordField, BooleanField, SubmitField from wtforms.validators import ValidationError, DataRequired, Email, EqualTo +from app.models import User class LoginForm(FlaskForm): username = StringField('Username', validators=[DataRequired()]) password = PasswordField('Password', validators=[DataRequired()]) remember_me = BooleanField('Remember Me') - submit = SubmitField('Sign In') \ No newline at end of file + submit = SubmitField('Sign In') + + +class RegistrationForm(FlaskForm): + username = StringField('Username', validators=[DataRequired()]) + email = StringField('Email', validators=[DataRequired(), Email()]) + password = PasswordField('Password', validators=[DataRequired()]) + password2 = PasswordField( + 'Repeat Password', validators=[DataRequired(), EqualTo('password')]) + submit = SubmitField('Register') + + def validate_username(self, username): + user = User.query.filter_by(username=username.data).first() + if user is not None: + raise ValidationError('Please use a different username.') + + def validate_email(self, email): + user = User.query.filter_by(email=email.data).first() + if user is not None: + raise ValidationError('Please use a different email address.') \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index e6ec895..8593cfa 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,4 +1,11 @@ from app import app +from app import db +from app.forms import LoginForm, RegistrationForm +from app.models import User +from flask import render_template, flash, redirect, url_for +from flask_login import current_user, login_user, logout_user +from flask_login import login_required + @app.route('/') @app.route('/index') @@ -6,11 +13,43 @@ def index(): return "Hello, World!" -@app.route('/login') -def index(): - return "Hello, World!" +@app.route('/register', methods=['GET', 'POST']) +def register(): + if current_user.is_authenticated: + return redirect(url_for('index')) + form = RegistrationForm() + if form.validate_on_submit(): + user = User(username=form.username.data, email=form.email.data) + user.set_password(form.password.data) + db.session.add(user) + db.session.commit() + flash('Congratulations, you are now a registered user!') + return redirect(url_for('login')) + return render_template('register.html', title='Register', form=form) + + +@app.route('/login', methods=['GET', 'POST']) +def login(): + if current_user.is_authenticated: + return redirect(url_for('index')) + form = LoginForm() + if form.validate_on_submit(): + user = User.query.filter_by(username=form.username.data).first() + if user is None or not user.check_password(form.password.data): + flash('Invalid username or password') + return redirect(url_for('login')) + login_user(user, remember=form.remember_me.data) + return redirect(url_for('admin')) + return render_template('login.html', title='Sign In', form=form) @app.route('/admin') -def index(): - return "Hello, World!" \ No newline at end of file +@login_required +def admin(): + return "Hello, World!" + + +@app.route('/logout') +def logout(): + logout_user() + return redirect(url_for('index')) diff --git a/app/templates/login.html b/app/templates/login.html index 84ce1fd..82132ba 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block content %} +

Hi, {{ current_user.username }}!

Sign In

{{ form.hidden_tag() }} diff --git a/app/templates/register.html b/app/templates/register.html new file mode 100644 index 0000000..c29b6e9 --- /dev/null +++ b/app/templates/register.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} + +{% block content %} +

Hi, {{ current_user.username }}!

+

Register

+ + {{ form.hidden_tag() }} +

+ {{ form.username.label }}
+ {{ form.username(size=32) }}
+ {% for error in form.username.errors %} + [{{ error }}] + {% endfor %} +

+

+ {{ form.email.label }}
+ {{ form.email(size=64) }}
+ {% for error in form.email.errors %} + [{{ error }}] + {% endfor %} +

+

+ {{ form.password.label }}
+ {{ form.password(size=32) }}
+ {% for error in form.password.errors %} + [{{ error }}] + {% endfor %} +

+

+ {{ form.password2.label }}
+ {{ form.password2(size=32) }}
+ {% for error in form.password2.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+{% endblock %} \ No newline at end of file