From a79fdc74071f166a0205feb3b0c69c3c2db914a8 Mon Sep 17 00:00:00 2001 From: Jafsari Date: Mon, 11 Dec 2017 16:55:30 -0800 Subject: [PATCH] adding flask login --- Unit-02/04-flask-login/app.py | 6 + Unit-02/04-flask-login/manage.py | 12 ++ Unit-02/04-flask-login/migrations/README | 1 + Unit-02/04-flask-login/migrations/alembic.ini | 45 +++++++ Unit-02/04-flask-login/migrations/env.py | 87 +++++++++++++ .../04-flask-login/migrations/script.py.mako | 24 ++++ .../migrations/versions/16b913010305_.py | 32 +++++ .../cd8c47228091_adding_messages_table.py | 34 ++++++ .../fd9887ad4857_adding_users_table.py | 33 +++++ Unit-02/04-flask-login/project/__init__.py | 40 ++++++ .../project/decorators/__init__.py | 22 ++++ .../04-flask-login/project/messages/forms.py | 8 ++ .../messages/templates/messages/edit.html | 24 ++++ .../messages/templates/messages/index.html | 17 +++ .../messages/templates/messages/new.html | 23 ++++ .../messages/templates/messages/show.html | 0 .../04-flask-login/project/messages/views.py | 67 ++++++++++ Unit-02/04-flask-login/project/models.py | 40 ++++++ .../project/templates/base.html | 26 ++++ Unit-02/04-flask-login/project/users/forms.py | 16 +++ .../project/users/templates/users/edit.html | 24 ++++ .../project/users/templates/users/index.html | 22 ++++ .../project/users/templates/users/login.html | 24 ++++ .../project/users/templates/users/new.html | 24 ++++ .../project/users/templates/users/show.html | 0 Unit-02/04-flask-login/project/users/views.py | 114 ++++++++++++++++++ 26 files changed, 765 insertions(+) create mode 100644 Unit-02/04-flask-login/app.py create mode 100644 Unit-02/04-flask-login/manage.py create mode 100755 Unit-02/04-flask-login/migrations/README create mode 100644 Unit-02/04-flask-login/migrations/alembic.ini create mode 100755 Unit-02/04-flask-login/migrations/env.py create mode 100755 Unit-02/04-flask-login/migrations/script.py.mako create mode 100644 Unit-02/04-flask-login/migrations/versions/16b913010305_.py create mode 100644 Unit-02/04-flask-login/migrations/versions/cd8c47228091_adding_messages_table.py create mode 100644 Unit-02/04-flask-login/migrations/versions/fd9887ad4857_adding_users_table.py create mode 100644 Unit-02/04-flask-login/project/__init__.py create mode 100644 Unit-02/04-flask-login/project/decorators/__init__.py create mode 100644 Unit-02/04-flask-login/project/messages/forms.py create mode 100644 Unit-02/04-flask-login/project/messages/templates/messages/edit.html create mode 100644 Unit-02/04-flask-login/project/messages/templates/messages/index.html create mode 100644 Unit-02/04-flask-login/project/messages/templates/messages/new.html create mode 100644 Unit-02/04-flask-login/project/messages/templates/messages/show.html create mode 100644 Unit-02/04-flask-login/project/messages/views.py create mode 100644 Unit-02/04-flask-login/project/models.py create mode 100644 Unit-02/04-flask-login/project/templates/base.html create mode 100644 Unit-02/04-flask-login/project/users/forms.py create mode 100644 Unit-02/04-flask-login/project/users/templates/users/edit.html create mode 100644 Unit-02/04-flask-login/project/users/templates/users/index.html create mode 100644 Unit-02/04-flask-login/project/users/templates/users/login.html create mode 100644 Unit-02/04-flask-login/project/users/templates/users/new.html create mode 100644 Unit-02/04-flask-login/project/users/templates/users/show.html create mode 100644 Unit-02/04-flask-login/project/users/views.py diff --git a/Unit-02/04-flask-login/app.py b/Unit-02/04-flask-login/app.py new file mode 100644 index 0000000..8447e37 --- /dev/null +++ b/Unit-02/04-flask-login/app.py @@ -0,0 +1,6 @@ +from project import app + +if __name__ == '__main__': + app.run(debug=True,port=3000) + + diff --git a/Unit-02/04-flask-login/manage.py b/Unit-02/04-flask-login/manage.py new file mode 100644 index 0000000..ee491c4 --- /dev/null +++ b/Unit-02/04-flask-login/manage.py @@ -0,0 +1,12 @@ +from project import app,db +from flask_script import Manager +from flask_migrate import Migrate,MigrateCommand + + +migrate = Migrate(app,db) + +manager = Manager(app) +manager.add_command('db',MigrateCommand) + +if __name__ == '__main__': + manager.run() \ No newline at end of file diff --git a/Unit-02/04-flask-login/migrations/README b/Unit-02/04-flask-login/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/Unit-02/04-flask-login/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/Unit-02/04-flask-login/migrations/alembic.ini b/Unit-02/04-flask-login/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/Unit-02/04-flask-login/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/Unit-02/04-flask-login/migrations/env.py b/Unit-02/04-flask-login/migrations/env.py new file mode 100755 index 0000000..23663ff --- /dev/null +++ b/Unit-02/04-flask-login/migrations/env.py @@ -0,0 +1,87 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig +import logging + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', + current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + engine = engine_from_config(config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure(connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/Unit-02/04-flask-login/migrations/script.py.mako b/Unit-02/04-flask-login/migrations/script.py.mako new file mode 100755 index 0000000..2c01563 --- /dev/null +++ b/Unit-02/04-flask-login/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/Unit-02/04-flask-login/migrations/versions/16b913010305_.py b/Unit-02/04-flask-login/migrations/versions/16b913010305_.py new file mode 100644 index 0000000..93008c9 --- /dev/null +++ b/Unit-02/04-flask-login/migrations/versions/16b913010305_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 16b913010305 +Revises: cd8c47228091 +Create Date: 2017-12-06 11:29:03.476234 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '16b913010305' +down_revision = 'cd8c47228091' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('password', sa.Text(), nullable=True)) + op.add_column('users', sa.Column('username', sa.Text(), nullable=True)) + op.create_unique_constraint(None, 'users', ['username']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'users', type_='unique') + op.drop_column('users', 'username') + op.drop_column('users', 'password') + # ### end Alembic commands ### diff --git a/Unit-02/04-flask-login/migrations/versions/cd8c47228091_adding_messages_table.py b/Unit-02/04-flask-login/migrations/versions/cd8c47228091_adding_messages_table.py new file mode 100644 index 0000000..034edea --- /dev/null +++ b/Unit-02/04-flask-login/migrations/versions/cd8c47228091_adding_messages_table.py @@ -0,0 +1,34 @@ +"""adding messages table + +Revision ID: cd8c47228091 +Revises: fd9887ad4857 +Create Date: 2017-12-02 20:33:15.697734 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cd8c47228091' +down_revision = 'fd9887ad4857' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('messages', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('content', sa.Text(), nullable=True), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('messages') + # ### end Alembic commands ### diff --git a/Unit-02/04-flask-login/migrations/versions/fd9887ad4857_adding_users_table.py b/Unit-02/04-flask-login/migrations/versions/fd9887ad4857_adding_users_table.py new file mode 100644 index 0000000..5e0cc08 --- /dev/null +++ b/Unit-02/04-flask-login/migrations/versions/fd9887ad4857_adding_users_table.py @@ -0,0 +1,33 @@ +"""adding users table + +Revision ID: fd9887ad4857 +Revises: +Create Date: 2017-12-02 19:01:34.274330 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fd9887ad4857' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('users', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('first_name', sa.Text(), nullable=True), + sa.Column('last_name', sa.Text(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('users') + # ### end Alembic commands ### diff --git a/Unit-02/04-flask-login/project/__init__.py b/Unit-02/04-flask-login/project/__init__.py new file mode 100644 index 0000000..831cd09 --- /dev/null +++ b/Unit-02/04-flask-login/project/__init__.py @@ -0,0 +1,40 @@ +from flask import Flask, redirect, url_for +from flask_sqlalchemy import SQLAlchemy +from flask_modus import Modus +from flask_bcrypt import Bcrypt +import os +from flask_login import LoginManager + +app = Flask(__name__) +bcrypt = Bcrypt(app) +login_manager = LoginManager() +login_manager.init_app(app) +app.config['SQLALCHEMY_DATABASE_URI'] = "postgres://localhost/users-messages-bcrypt" +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY') +modus = Modus(app) +db = SQLAlchemy(app) + + +from project.users.views import users_blueprint +from project.messages.views import messages_blueprint + +app.register_blueprint(users_blueprint,url_prefix ='/users') +app.register_blueprint(messages_blueprint,url_prefix ='/users//messages') + +login_manager.login_view = 'users.login' + +from project.models import User + + +@login_manager.user_loader +def load_user(user_id): + return User.query.get(user_id) +@app.route('/') +def root(): + return redirect(url_for('users.index')) + + + + + ## WOOOOOOO LETS NEST THESE MESSAGES diff --git a/Unit-02/04-flask-login/project/decorators/__init__.py b/Unit-02/04-flask-login/project/decorators/__init__.py new file mode 100644 index 0000000..c4b8a7b --- /dev/null +++ b/Unit-02/04-flask-login/project/decorators/__init__.py @@ -0,0 +1,22 @@ +from functools import wraps +from flask import redirect, url_for, session, flash +from flask_login import current_user + +def prevent_login_signup(fn): + @wraps(fn) + def wrapper(*args, **kwargs): + if session.get('user_id'): + flash("You are logged in already") + return redirect(url_for('users.index')) + return fn(*args, **kwargs) + return wrapper + +def ensure_correct_user(fn): + @wraps(fn) + def wrapper(*args, **kwargs): + correct_id = kwargs.get('user_id') or kwargs.get('id') + if correct_id != current_user.id: + flash("Not Authorized") + return redirect(url_for('users.index',id=session.get('user_id'))) + return fn(*args, **kwargs) + return wrapper \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/messages/forms.py b/Unit-02/04-flask-login/project/messages/forms.py new file mode 100644 index 0000000..9ed4daa --- /dev/null +++ b/Unit-02/04-flask-login/project/messages/forms.py @@ -0,0 +1,8 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, validators + +class MessageForm(FlaskForm): + content = StringField('Content',[validators.DataRequired()]) + +class DeleteForm(FlaskForm): + pass \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/messages/templates/messages/edit.html b/Unit-02/04-flask-login/project/messages/templates/messages/edit.html new file mode 100644 index 0000000..700778d --- /dev/null +++ b/Unit-02/04-flask-login/project/messages/templates/messages/edit.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} + +{% block content %} +

Edit a new message!

+
+ {{ form.hidden_tag() }} + + {% for field in form if field.widget.input_type != 'hidden' %} +

+ {{field.label}} + {{field}} + + {% if field.errors %} + {% for error in field.errors %} + {{error}} + {% endfor %} + {% endif %} + +

+ {% endfor %} + + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/messages/templates/messages/index.html b/Unit-02/04-flask-login/project/messages/templates/messages/index.html new file mode 100644 index 0000000..29222fd --- /dev/null +++ b/Unit-02/04-flask-login/project/messages/templates/messages/index.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} + +{% block content %} + Add a new message! +

See messages for {{user.first_name}}

+ {% for message in user.messages %} +

+ {{message.content}} +
+ Edit a message! +

+ {{delete_form.hidden_tag()}} + +
+

+ {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/messages/templates/messages/new.html b/Unit-02/04-flask-login/project/messages/templates/messages/new.html new file mode 100644 index 0000000..8580fa6 --- /dev/null +++ b/Unit-02/04-flask-login/project/messages/templates/messages/new.html @@ -0,0 +1,23 @@ +{% extends 'base.html' %} + +{% block content %} +

Add a new message!

+
+ {{form.hidden_tag()}} + + {% for field in form if field.widget.input_type != 'hidden' %} +

+ {{field.label}} + {{field}} + + {% if field.errors %} + {% for error in field.errors %} + {{error}} + {% endfor %} + {% endif %} + +

+ {% endfor %} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/messages/templates/messages/show.html b/Unit-02/04-flask-login/project/messages/templates/messages/show.html new file mode 100644 index 0000000..e69de29 diff --git a/Unit-02/04-flask-login/project/messages/views.py b/Unit-02/04-flask-login/project/messages/views.py new file mode 100644 index 0000000..e0d216c --- /dev/null +++ b/Unit-02/04-flask-login/project/messages/views.py @@ -0,0 +1,67 @@ +from flask import redirect, render_template, request, url_for, flash,Blueprint +from project.messages.forms import MessageForm, DeleteForm +from project.models import Message,User +from project import db +from project.decorators import ensure_correct_user +from flask_login import login_user, logout_user, login_required + +messages_blueprint = Blueprint( + 'messages', + __name__, + template_folder='templates' + ) + +@messages_blueprint.route('/', methods =["GET", "POST"]) +@login_required +def index(user_id): + user = User.query.get(user_id) + if request.method == "POST": + form = MessageForm(request.form) + if form.validate(): + new_message = Message(form.content.data, user.id) + db.session.add(new_message) + db.session.commit() + flash('Message Created!') + return redirect(url_for('messages.index', user_id=user.id)) + return render_template('messages/new.html', form=form, user=user) + return render_template('messages/index.html', user=user) + + +@messages_blueprint.route('/new', methods=["GET", "POST"]) +@login_required +@ensure_correct_user +def new(user_id): + form = MessageForm() + return render_template('messages/new.html', user=User.query.get(user_id), form=form) + +@messages_blueprint.route('//edit') +@login_required +@ensure_correct_user +def edit(user_id, id): + found_message = Message.query.get(id) + form = MessageForm(obj=found_message) + return render_template('messages/edit.html', message=found_message, form=form) + + +@messages_blueprint.route('/', methods=["GET", "PATCH", "DELETE"]) +@login_required +@ensure_correct_user +def show(user_id, id): + found_message = Message.query.get(id) + if request.method == b"PATCH": + form = MessageForm(request.form) + if form.validate(): + found_message.content = request.form['content'] + db.session.add(found_message) + db.session.commit() + flash('Message Updated!') + return redirect(url_for('messages.index', user_id=user_id)) + return render_template('messages/edit.html', message=found_message, form=form) + if request.method == b"DELETE": + delete_form = DeleteForm(request.form) + if delete_form.validate(): + db.session.delete(found_message) + db.session.commit() + flash('Message Deleted!') + return redirect(url_for('messages.index', user_id=user_id)) + return render_template('messages/show.html', message=found_message) \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/models.py b/Unit-02/04-flask-login/project/models.py new file mode 100644 index 0000000..76a3aa5 --- /dev/null +++ b/Unit-02/04-flask-login/project/models.py @@ -0,0 +1,40 @@ +from project import db, bcrypt +from flask_login import UserMixin + +class User(db.Model,UserMixin): + __tablename__ = 'users' + + id = db.Column(db.Integer, primary_key=True) + username = db.Column(db.Text, unique=True) + password = db.Column(db.Text) + first_name = db.Column(db.Text) + last_name = db.Column(db.Text) + messages = db.relationship('Message', backref='user', lazy='dynamic', cascade="all,delete") + + def __init__(self, first_name, last_name, username, password): + self.first_name = first_name + self.last_name = last_name + self.username = username + self.password = bcrypt.generate_password_hash(password).decode('UTF-8') + + @classmethod + def authenticate(cls, username, password): + found_user = cls.query.filter_by(username = username).first() + if found_user: + authenticated_user = bcrypt.check_password_hash(found_user.password, password) + if authenticated_user: + return found_user + return False + + +class Message(db.Model): + + __tablename__ = "messages" + + id = db.Column(db.Integer, primary_key=True) + content = db.Column(db.Text) + user_id = db.Column(db.Integer, db.ForeignKey('users.id')) + + def __init__(self, content, user_id): + self.content = content + self.user_id = user_id \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/templates/base.html b/Unit-02/04-flask-login/project/templates/base.html new file mode 100644 index 0000000..ba21529 --- /dev/null +++ b/Unit-02/04-flask-login/project/templates/base.html @@ -0,0 +1,26 @@ + + + + + Document + + + {% with messages = get_flashed_messages() %} + {% if messages %} + {% for message in messages %} +

{{ message }}

+ {% endfor %} + {% endif %} + {% endwith %} +

+ {% if current_user.is_authenticated %} + Logout! + {% else %} + Login! + {% endif %} +

+ + {% block content %} + {% endblock %} + + \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/forms.py b/Unit-02/04-flask-login/project/users/forms.py new file mode 100644 index 0000000..4acfc59 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/forms.py @@ -0,0 +1,16 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, validators,PasswordField + +class UserForm(FlaskForm): + first_name = StringField('First Name', [validators.DataRequired()]) + last_name = StringField('Last Name',[validators.DataRequired()]) + username = StringField('username', [validators.DataRequired()]) + password = PasswordField('Password',[validators.DataRequired()]) + +class LoginForm(FlaskForm): + username = StringField('username', [validators.DataRequired()]) + password = PasswordField('Password',[validators.DataRequired()]) + + +class DeleteForm(FlaskForm): + pass \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/templates/users/edit.html b/Unit-02/04-flask-login/project/users/templates/users/edit.html new file mode 100644 index 0000000..bad2070 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/templates/users/edit.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} + +{%block content%} +

Edit the current User!

+
+ {{ form.hidden_tag() }} + + {% for field in form if field.widget.input_type != 'hidden' %} +

+ {{field.label}} + {{field}} + + {% if field.errors %} + {%for error in field.errors %} + {{error}} + + {% endfor %} + {% endif %} + +

+ {% endfor %} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/templates/users/index.html b/Unit-02/04-flask-login/project/users/templates/users/index.html new file mode 100644 index 0000000..db5c556 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/templates/users/index.html @@ -0,0 +1,22 @@ +_{%extends 'base.html'%} + +{% block content %} + Add a new user +

see all the users

+

Welcome Back {{current_user.username}}

+Logout +{% for user in users %} +

+ {{user.first_name}} {{user.last_name}} + See all messages for {{user.first_name}}! + Edit a user +

+ {{delete_form.hidden_tag()}} + + +
+

+ +{% endfor %} + +{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/templates/users/login.html b/Unit-02/04-flask-login/project/users/templates/users/login.html new file mode 100644 index 0000000..cd79ab1 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/templates/users/login.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} + +{%block content%} +

Log in!

+
+ {{ form.csrf_token }} + + {% for field in form if field.widget.input_type != 'hidden' %} +

+ {{field.label}} + {{field}} + + {% if field.errors %} + {%for error in field.errors %} + {{error}} + + {% endfor %} + {% endif %} + +

+ {% endfor %} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/templates/users/new.html b/Unit-02/04-flask-login/project/users/templates/users/new.html new file mode 100644 index 0000000..9e84f21 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/templates/users/new.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} + +{%block content%} +

Add a new User

+
+ {{ form.hidden_tag() }} + + {% for field in form if field.widget.input_type != 'hidden' %} +

+ {{field.label}} + {{field}} + + {% if field.errors %} + {%for error in field.errors %} + {{error}} + + {% endfor %} + {% endif %} + +

+ {% endfor %} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/04-flask-login/project/users/templates/users/show.html b/Unit-02/04-flask-login/project/users/templates/users/show.html new file mode 100644 index 0000000..e69de29 diff --git a/Unit-02/04-flask-login/project/users/views.py b/Unit-02/04-flask-login/project/users/views.py new file mode 100644 index 0000000..fc68bd2 --- /dev/null +++ b/Unit-02/04-flask-login/project/users/views.py @@ -0,0 +1,114 @@ +from flask import redirect, render_template, request, url_for, Blueprint, flash +from project.users.forms import UserForm, DeleteForm, LoginForm +from project.models import User +from project import db +from sqlalchemy.exc import IntegrityError +from project.decorators import prevent_login_signup, ensure_correct_user +from flask_login import login_user, logout_user, login_required + +users_blueprint = Blueprint( + 'users', + __name__, + template_folder='templates' + ) + + +@users_blueprint.route('/') +@login_required +def index(): + delete_form = DeleteForm() + return render_template('users/index.html',users=User.query.all(),delete_form=delete_form) + +@users_blueprint.route('/', methods = ['POST']) +@prevent_login_signup +def signup(): + + + form = UserForm(request.form) + if form.validate(): + try: + new_user = User( + form.first_name.data, + form.last_name.data, + form.username.data, + form.password.data) + db.session.add(new_user) + db.session.commit() + login_user(new_user) + + flash('User Created!') + return redirect(url_for('users.index')) + except IntegrityError: + flash('Username already taken!') + return render_template('users/new.html', form=form) + + return render_template('users/new.html', form=form) + + + +@users_blueprint.route('/login',methods = ['GET','POST']) +@prevent_login_signup +def login(): + form = LoginForm(request.form) + if request.method == 'POST': + if form.validate(): + authenticated_user = User.authenticate(form.username.data,form.password.data) + if authenticated_user: + login_user(authenticated_user) + flash('You are Logged in') + return redirect(url_for('users.index')) + else: + flash('Invalid Credentials') + return redirect(url_for('users.login')) + return render_template('users/login.html',form = form) + + +@users_blueprint.route('/new') +@prevent_login_signup +def new(): + + user_form = UserForm() + return render_template('users/new.html',form = user_form) + + +@users_blueprint.route('//edit') +@ensure_correct_user +@login_required +def edit(id): + found_user = User.query.get(id) + user_form = UserForm(obj=found_user) + + return render_template('users/edit.html', user = found_user, form=user_form) + +@users_blueprint.route('/',methods = ['GET','PATCH','DELETE']) +@login_required +@ensure_correct_user +def show(id): + found_user = User.query.get(id) + if request.method == b"PATCH": + form = UserForm(request.form) + if form.validate(): + found_user.first_name = form.first_name.data + found_user.last_name = form.last_name.data + db.session.add(found_user) + db.session.commit() + flash('User Updated!') + return redirect(url_for('users.index')) + return render_template('users/edit.html', user=found_user, form=form) + if request.method == b"DELETE": + delete_form = DeleteForm(request.form) + if delete_form.validate(): + db.session.delete(found_user) + db.session.commit() + logout_user() + flash('User Deleted!') + return redirect(url_for('users.index')) + return render_template('users/show.html', user=found_user) + + +@users_blueprint.route('/logout') +@login_required +def logout(): + logout_user() + flash('Logged out!') + return redirect(url_for('users.login')) \ No newline at end of file