From 1d09487935f9efdcc1bc9406d9af23a83b41b68d Mon Sep 17 00:00:00 2001 From: Toy Rik Date: Sat, 13 Sep 2025 08:10:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=B3=D0=B8=D0=BD=D1=8B=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 5 ++- app/forms.py | 35 ++++++++++++++--- app/models.py | 30 ++++++++++++--- app/routes.py | 76 +++++++++++++++++++++++++++---------- app/templates/base.html | 35 +++++++++-------- app/templates/index.html | 7 ++-- app/templates/login.html | 43 +++++++++++---------- app/templates/register.html | 37 ++++++++++++++++++ 8 files changed, 197 insertions(+), 71 deletions(-) create mode 100644 app/templates/register.html diff --git a/app/__init__.py b/app/__init__.py index 59127e7..7366fef 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,11 +1,14 @@ from flask import Flask -from config import Config from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate +from flask_login import LoginManager +from config import Config app = Flask(__name__) app.config.from_object(Config) db = SQLAlchemy(app) migrate = Migrate(app, db) +login = LoginManager(app) +login.login_view = 'login' from app import routes, models diff --git a/app/forms.py b/app/forms.py index 4285d93..0189742 100644 --- a/app/forms.py +++ b/app/forms.py @@ -1,9 +1,34 @@ from flask_wtf import FlaskForm from wtforms import StringField, PasswordField, BooleanField, SubmitField -from wtforms.validators import DataRequired +from wtforms.validators import ValidationError, DataRequired, Email, EqualTo +import sqlalchemy as sa +from app import db +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') + username = StringField('Username', validators=[DataRequired()]) + password = PasswordField('Password', validators=[DataRequired()]) + remember_me = BooleanField('Remember Me') + 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 = db.session.scalar(sa.select(User).where( + User.username == username.data)) + if user is not None: + raise ValidationError('Please use a different username.') + + def validate_email(self, email): + user = db.session.scalar(sa.select(User).where( + User.email == email.data)) + if user is not None: + raise ValidationError('Please use a different email address.') diff --git a/app/models.py b/app/models.py index b124fad..1448a0e 100644 --- a/app/models.py +++ b/app/models.py @@ -2,26 +2,44 @@ from datetime import datetime, timezone from typing import Optional import sqlalchemy as sa import sqlalchemy.orm as so -from app import db +from flask_login import UserMixin +from werkzeug.security import generate_password_hash, check_password_hash +from app import db, login -class User(db.Model): +class User(UserMixin, db.Model): id: so.Mapped[int] = so.mapped_column(primary_key=True) - username: so.Mapped[str] = so.mapped_column(sa.String(64), index=True, unique=True) - email: so.Mapped[str] = so.mapped_column(sa.String(120), index=True, unique=True) + username: so.Mapped[str] = so.mapped_column(sa.String(64), index=True, + unique=True) + email: so.Mapped[str] = so.mapped_column(sa.String(120), index=True, + unique=True) password_hash: so.Mapped[Optional[str]] = so.mapped_column(sa.String(256)) - posts: so.WriteOnlyMapped['Post'] = so.relationship(back_populates='author') + posts: so.WriteOnlyMapped['Post'] = so.relationship( + back_populates='author') def __repr__(self): return ''.format(self.username) + def set_password(self, password): + self.password_hash = generate_password_hash(password) + + def check_password(self, password): + return check_password_hash(self.password_hash, password) + + +@login.user_loader +def load_user(id): + return db.session.get(User, int(id)) + + class Post(db.Model): id: so.Mapped[int] = so.mapped_column(primary_key=True) body: so.Mapped[str] = so.mapped_column(sa.String(140)) timestamp: so.Mapped[datetime] = so.mapped_column( index=True, default=lambda: datetime.now(timezone.utc)) - user_id: so.Mapped[int] = so.mapped_column(sa.ForeignKey(User.id), index=True) + user_id: so.Mapped[int] = so.mapped_column(sa.ForeignKey(User.id), + index=True) author: so.Mapped[User] = so.relationship(back_populates='posts') diff --git a/app/routes.py b/app/routes.py index d6d1f8f..2395191 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,28 +1,64 @@ -from flask import render_template, flash, redirect, url_for -from app import app -from app.forms import LoginForm +from urllib.parse import urlsplit +from flask import render_template, flash, redirect, url_for, request +from flask_login import login_user, logout_user, current_user, login_required +import sqlalchemy as sa +from app import app, db +from app.forms import LoginForm, RegistrationForm +from app.models import User + @app.route('/') @app.route('/index') +@login_required def index(): - user = {'username': 'Miguel'} - posts = [ - { - 'author': {'username': 'John'}, - 'body': 'Beautiful day in Portland!' - }, - { - 'author': {'username': 'Susan'}, - 'body': 'The Avengers movie was so cool!' - } - ] - return render_template('index.html', title='Home', user=user, posts=posts) + posts = [ + { + 'author': {'username': 'John'}, + 'body': 'Beautiful day in Portland!' + }, + { + 'author': {'username': 'Susan'}, + 'body': 'The Avengers movie was so cool!' + } + ] + return render_template('index.html', title='Home', posts=posts) + @app.route('/login', methods=['GET', 'POST']) def login(): - form = LoginForm() - if form.validate_on_submit(): - flash('Login requested for user {}, remember_me={}'.format( - form.username.data, form.remember_me.data)) + if current_user.is_authenticated: + return redirect(url_for('index')) + form = LoginForm() + if form.validate_on_submit(): + user = db.session.scalar( + sa.select(User).where(User.username == form.username.data)) + 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) + next_page = request.args.get('next') + if not next_page or urlsplit(next_page).netloc != '': + next_page = url_for('index') + return redirect(next_page) + return render_template('login.html', title='Sign In', form=form) + + +@app.route('/logout') +def logout(): + logout_user() return redirect(url_for('index')) - return render_template('login.html', title='Sign In', form=form) + + +@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) diff --git a/app/templates/base.html b/app/templates/base.html index a0d7790..496ea6d 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -1,27 +1,32 @@ - {% if title %} - {{ title }} - Microblog - {% else %} - Welcome to Microblog - {% endif %} + {% if title %} + {{ title }} - Microblog + {% else %} + Welcome to Microblog + {% endif %} -
Microblog: +
+ Microblog: Home + {% if current_user.is_anonymous %} Login + {% else %} + Logout + {% endif %}
- {% with messages = get_flashed_messages() %} - {% if messages %} -
    - {% for message in messages %} -
  • {{ message }}
    • - {% endfor %} -
- {% endif %} - {% endwith %} + {% with messages = get_flashed_messages() %} + {% if messages %} +
    + {% for message in messages %} +
  • {{ message }}
    • + {% endfor %} +
+ {% endif %} + {% endwith %} {% block content %}{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html index 0b3ac7b..2565a01 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,7 +1,8 @@ {% extends "base.html" %} + {% block content %} -

Hi, {{ user.username }}!

- {% for post in posts %} +

Hi, {{ current_user.username }}!

+ {% for post in posts %}

{{ post.author.username }} says: {{ post.body }}

- {% endfor %} + {% endfor %} {% endblock %} diff --git a/app/templates/login.html b/app/templates/login.html index 163059d..2875293 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,24 +1,25 @@ {% extends "base.html" %} {% block content %} -

Sign In

-
- {{ form.hidden_tag() }} -

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

-

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

-

{{ form.remember_me() }} {{ form.remember_me.label }}

-

{{ form.submit() }}

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

Sign In

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

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

+

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

+

{{ form.remember_me() }} {{ form.remember_me.label }}

+

{{ form.submit() }}

+
+

New User? Click to Register!

+{% endblock %} diff --git a/app/templates/register.html b/app/templates/register.html new file mode 100644 index 0000000..37b7ac5 --- /dev/null +++ b/app/templates/register.html @@ -0,0 +1,37 @@ +{% extends "base.html" %} + +{% block content %} +

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 %}