From 91c508039824a3847ea2345eddc7290f2baa5af9 Mon Sep 17 00:00:00 2001 From: "Sean C. Mangosing" Date: Tue, 28 Nov 2017 16:16:48 -0800 Subject: [PATCH 1/4] started exercises --- Unit-01/03-templating/part-01/app.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Unit-01/03-templating/part-01/app.py diff --git a/Unit-01/03-templating/part-01/app.py b/Unit-01/03-templating/part-01/app.py new file mode 100644 index 0000000..b189b57 --- /dev/null +++ b/Unit-01/03-templating/part-01/app.py @@ -0,0 +1,10 @@ +from flask import Flask + +app = Flask(__name__) + + + + + +if __name__ == ('__main__'): + app.run(debug == True) \ No newline at end of file From 88cfede19bc9932825c7f3a4ad8271734392118f Mon Sep 17 00:00:00 2001 From: "Sean C. Mangosing" Date: Tue, 28 Nov 2017 16:19:20 -0800 Subject: [PATCH 2/4] deleted folder --- Unit-01/03-templating/part-01/app.py | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Unit-01/03-templating/part-01/app.py diff --git a/Unit-01/03-templating/part-01/app.py b/Unit-01/03-templating/part-01/app.py deleted file mode 100644 index b189b57..0000000 --- a/Unit-01/03-templating/part-01/app.py +++ /dev/null @@ -1,10 +0,0 @@ -from flask import Flask - -app = Flask(__name__) - - - - - -if __name__ == ('__main__'): - app.run(debug == True) \ No newline at end of file From 445ea5859d4de165cfcb545d50fceed8e31a05d8 Mon Sep 17 00:00:00 2001 From: "Sean C. Mangosing" Date: Wed, 6 Dec 2017 11:00:48 -0800 Subject: [PATCH 3/4] adding blueprints folder --- Unit-02/01-blueprints/flask-blueprints | 1 + 1 file changed, 1 insertion(+) create mode 160000 Unit-02/01-blueprints/flask-blueprints diff --git a/Unit-02/01-blueprints/flask-blueprints b/Unit-02/01-blueprints/flask-blueprints new file mode 160000 index 0000000..a39524b --- /dev/null +++ b/Unit-02/01-blueprints/flask-blueprints @@ -0,0 +1 @@ +Subproject commit a39524bd1884f0ffc7fc410c94c6b57e3b2a52f6 From 191b34f2c96980d025b3da4789b64fc3f2562a7d Mon Sep 17 00:00:00 2001 From: "Sean C. Mangosing" Date: Wed, 6 Dec 2017 16:11:11 -0800 Subject: [PATCH 4/4] changing structure --- Unit-02/01-blueprints/app.py | 4 + Unit-02/01-blueprints/flask-blueprints | 1 - Unit-02/01-blueprints/manage.py | 11 ++ Unit-02/01-blueprints/migrations/README | 1 + Unit-02/01-blueprints/migrations/alembic.ini | 45 +++++++ Unit-02/01-blueprints/migrations/env.py | 87 +++++++++++++ .../01-blueprints/migrations/script.py.mako | 24 ++++ .../migrations/versions/5b55e2cbcd3e_.py | 41 ++++++ .../migrations/versions/65ad82c22e57_.py | 32 +++++ Unit-02/01-blueprints/project/__init__.py | 27 ++++ .../01-blueprints/project/messages/forms.py | 8 ++ .../messages/templates/messages/edit.html | 7 ++ .../messages/templates/messages/index.html | 12 ++ .../messages/templates/messages/new.html | 8 ++ .../messages/templates/messages/show.html | 8 ++ .../01-blueprints/project/messages/views.py | 50 ++++++++ Unit-02/01-blueprints/project/models.py | 36 ++++++ .../01-blueprints/project/templates/base.html | 50 ++++++++ Unit-02/01-blueprints/project/users/forms.py | 16 +++ .../project/users/templates/users/edit.html | 16 +++ .../project/users/templates/users/index.html | 6 + .../project/users/templates/users/login.html | 15 +++ .../project/users/templates/users/new.html | 24 ++++ .../project/users/templates/users/show.html | 8 ++ .../users/templates/users/welcome.html | 12 ++ Unit-02/01-blueprints/project/users/views.py | 117 ++++++++++++++++++ Unit-02/01-blueprints/requirements.txt | 19 +++ 27 files changed, 684 insertions(+), 1 deletion(-) create mode 100644 Unit-02/01-blueprints/app.py delete mode 160000 Unit-02/01-blueprints/flask-blueprints create mode 100644 Unit-02/01-blueprints/manage.py create mode 100755 Unit-02/01-blueprints/migrations/README create mode 100644 Unit-02/01-blueprints/migrations/alembic.ini create mode 100755 Unit-02/01-blueprints/migrations/env.py create mode 100755 Unit-02/01-blueprints/migrations/script.py.mako create mode 100644 Unit-02/01-blueprints/migrations/versions/5b55e2cbcd3e_.py create mode 100644 Unit-02/01-blueprints/migrations/versions/65ad82c22e57_.py create mode 100644 Unit-02/01-blueprints/project/__init__.py create mode 100644 Unit-02/01-blueprints/project/messages/forms.py create mode 100644 Unit-02/01-blueprints/project/messages/templates/messages/edit.html create mode 100644 Unit-02/01-blueprints/project/messages/templates/messages/index.html create mode 100644 Unit-02/01-blueprints/project/messages/templates/messages/new.html create mode 100644 Unit-02/01-blueprints/project/messages/templates/messages/show.html create mode 100644 Unit-02/01-blueprints/project/messages/views.py create mode 100644 Unit-02/01-blueprints/project/models.py create mode 100644 Unit-02/01-blueprints/project/templates/base.html create mode 100644 Unit-02/01-blueprints/project/users/forms.py create mode 100644 Unit-02/01-blueprints/project/users/templates/users/edit.html create mode 100644 Unit-02/01-blueprints/project/users/templates/users/index.html create mode 100644 Unit-02/01-blueprints/project/users/templates/users/login.html create mode 100644 Unit-02/01-blueprints/project/users/templates/users/new.html create mode 100644 Unit-02/01-blueprints/project/users/templates/users/show.html create mode 100644 Unit-02/01-blueprints/project/users/templates/users/welcome.html create mode 100644 Unit-02/01-blueprints/project/users/views.py create mode 100644 Unit-02/01-blueprints/requirements.txt diff --git a/Unit-02/01-blueprints/app.py b/Unit-02/01-blueprints/app.py new file mode 100644 index 0000000..c049407 --- /dev/null +++ b/Unit-02/01-blueprints/app.py @@ -0,0 +1,4 @@ +from project import app + +if __name__ == '__main__': + app.run(debug=True, port=3000) \ No newline at end of file diff --git a/Unit-02/01-blueprints/flask-blueprints b/Unit-02/01-blueprints/flask-blueprints deleted file mode 160000 index a39524b..0000000 --- a/Unit-02/01-blueprints/flask-blueprints +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a39524bd1884f0ffc7fc410c94c6b57e3b2a52f6 diff --git a/Unit-02/01-blueprints/manage.py b/Unit-02/01-blueprints/manage.py new file mode 100644 index 0000000..5e89dca --- /dev/null +++ b/Unit-02/01-blueprints/manage.py @@ -0,0 +1,11 @@ +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/01-blueprints/migrations/README b/Unit-02/01-blueprints/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/Unit-02/01-blueprints/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/Unit-02/01-blueprints/migrations/alembic.ini b/Unit-02/01-blueprints/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/Unit-02/01-blueprints/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/01-blueprints/migrations/env.py b/Unit-02/01-blueprints/migrations/env.py new file mode 100755 index 0000000..23663ff --- /dev/null +++ b/Unit-02/01-blueprints/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/01-blueprints/migrations/script.py.mako b/Unit-02/01-blueprints/migrations/script.py.mako new file mode 100755 index 0000000..2c01563 --- /dev/null +++ b/Unit-02/01-blueprints/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/01-blueprints/migrations/versions/5b55e2cbcd3e_.py b/Unit-02/01-blueprints/migrations/versions/5b55e2cbcd3e_.py new file mode 100644 index 0000000..dd3aa21 --- /dev/null +++ b/Unit-02/01-blueprints/migrations/versions/5b55e2cbcd3e_.py @@ -0,0 +1,41 @@ +"""empty message + +Revision ID: 5b55e2cbcd3e +Revises: +Create Date: 2017-12-01 16:07:52.917466 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5b55e2cbcd3e' +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') + ) + 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') + op.drop_table('users') + # ### end Alembic commands ### diff --git a/Unit-02/01-blueprints/migrations/versions/65ad82c22e57_.py b/Unit-02/01-blueprints/migrations/versions/65ad82c22e57_.py new file mode 100644 index 0000000..b8c6de9 --- /dev/null +++ b/Unit-02/01-blueprints/migrations/versions/65ad82c22e57_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 65ad82c22e57 +Revises: 5b55e2cbcd3e +Create Date: 2017-12-05 14:55:55.379087 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '65ad82c22e57' +down_revision = '5b55e2cbcd3e' +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/01-blueprints/project/__init__.py b/Unit-02/01-blueprints/project/__init__.py new file mode 100644 index 0000000..ee0faf9 --- /dev/null +++ b/Unit-02/01-blueprints/project/__init__.py @@ -0,0 +1,27 @@ +from flask import Flask, url_for, redirect +from flask_sqlalchemy import SQLAlchemy +from flask_modus import Modus +#from forms import UserForm, MessageFrom, DeleteForm +from flask_bcrypt import Bcrypt +import os + +app = Flask(__name__) +bcrypt = Bcrypt(app) +app.config['SQLALCHEMY_DATABASE_URI'] = 'postgres://localhost/flask-blueprints' +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY') +modus = Modus(app) +db = SQLAlchemy(app) + +# import a blueprint that we will create +from project.users.views import users_blueprint +from project.messages.views import messages_blueprint + +# register our blueprints with the application +app.register_blueprint(users_blueprint, url_prefix='/users') +app.register_blueprint(messages_blueprint, url_prefix='/users//messages') + + +@app.route('/') +def root(): + return redirect(url_for('users.index')) diff --git a/Unit-02/01-blueprints/project/messages/forms.py b/Unit-02/01-blueprints/project/messages/forms.py new file mode 100644 index 0000000..c42e68d --- /dev/null +++ b/Unit-02/01-blueprints/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 diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/edit.html b/Unit-02/01-blueprints/project/messages/templates/messages/edit.html new file mode 100644 index 0000000..3cc66df --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/templates/messages/edit.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} {% block content %} +

This is the edit page for

+
+ + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/index.html b/Unit-02/01-blueprints/project/messages/templates/messages/index.html new file mode 100644 index 0000000..78adae9 --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/templates/messages/index.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% block content %} +

See all the Messages for: {{user.first_name}}

+ Add a new Message + +{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/new.html b/Unit-02/01-blueprints/project/messages/templates/messages/new.html new file mode 100644 index 0000000..97697a6 --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/templates/messages/new.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% block content %} +

Add a new Message

+
+ + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/show.html b/Unit-02/01-blueprints/project/messages/templates/messages/show.html new file mode 100644 index 0000000..2fbdb39 --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/templates/messages/show.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} {% block content %} +

See information about {{ user.first_name }} {{user.last_name}}

+Edit Student Information +
+ {{ delete_form.hidden_tag() }} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/messages/views.py b/Unit-02/01-blueprints/project/messages/views.py new file mode 100644 index 0000000..bd0aeaa --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/views.py @@ -0,0 +1,50 @@ +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 + +messages_blueprint = Blueprint( + 'messages', + __name__, + template_folder='templates' +) + + +# Messages Routes ---------------------------------------------------------------------> +@messages_blueprint.route("/", methods=["GET", "POST"]) +def index(user_id): + if request.method == "POST": + new_message = Message(request.form['content'], 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/index.html", user=User.query.get(user_id)) + + +@messages_blueprint.route("/new", methods=["GET", "POST"]) +def new(user_id): + return render_template("messages/new.html", user=User.query.get(user_id)) + + +@messages_blueprint.route("//edit") +def edit(user_id, id): + found_message = Message.query.get(id) + return render_template("messages/edit.html", message=found_message) + + +@messages_blueprint.route("/", methods=["GET", "PATCH", "DELETE"]) +def show(user_id, id): + found_message = Message.query.get(id) + if request.method == b"PATCH": + 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)) + if request.method == b"DELETE": + 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) diff --git a/Unit-02/01-blueprints/project/models.py b/Unit-02/01-blueprints/project/models.py new file mode 100644 index 0000000..f4754d9 --- /dev/null +++ b/Unit-02/01-blueprints/project/models.py @@ -0,0 +1,36 @@ +from project import db, bcrypt # project refers to __init__.py file + +#db.create_All() in terminal creates table +class User(db.Model): + + __tablename__ = "users" + + id = db.Column(db.Integer, primary_key=True) + username = db.Column(db.Text, unique=True) + first_name = db.Column(db.Text) + last_name = db.Column(db.Text) + password = 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') + + def __repr__(self): + return "The student's name is {} {}".format(self.first_name, self.last_name) + + +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 diff --git a/Unit-02/01-blueprints/project/templates/base.html b/Unit-02/01-blueprints/project/templates/base.html new file mode 100644 index 0000000..b5ccccb --- /dev/null +++ b/Unit-02/01-blueprints/project/templates/base.html @@ -0,0 +1,50 @@ + + + + + + + BluePrints Refactor + + + + + +
+ {% with messages = get_flashed_messages() %} {% if messages %} +
    + {% for message in messages %} +

    {{ message }}

    + {% endfor %} +
+ {% endif %} {% endwith %} + + {% block content %} + {% endblock %} +
+ + + + + + \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/users/forms.py b/Unit-02/01-blueprints/project/users/forms.py new file mode 100644 index 0000000..369b060 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/forms.py @@ -0,0 +1,16 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, PasswordField, validators + +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 diff --git a/Unit-02/01-blueprints/project/users/templates/users/edit.html b/Unit-02/01-blueprints/project/users/templates/users/edit.html new file mode 100644 index 0000000..d5768c2 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/edit.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} {% block content %} +

This is the edit page for: {{user.first_name}} {{user.last_name}}

+
+ {{ 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/01-blueprints/project/users/templates/users/index.html b/Unit-02/01-blueprints/project/users/templates/users/index.html new file mode 100644 index 0000000..ff9e3c7 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/index.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% block content %} +

Either sign up, log in, or get out!

+ + +{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/users/templates/users/login.html b/Unit-02/01-blueprints/project/users/templates/users/login.html new file mode 100644 index 0000000..2bbae71 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/login.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} {% block content %} +

Login

+ +
+ {{ 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/01-blueprints/project/users/templates/users/new.html b/Unit-02/01-blueprints/project/users/templates/users/new.html new file mode 100644 index 0000000..8a32939 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/new.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} +{% block content %} +

Adding 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/01-blueprints/project/users/templates/users/show.html b/Unit-02/01-blueprints/project/users/templates/users/show.html new file mode 100644 index 0000000..2fbdb39 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/show.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} {% block content %} +

See information about {{ user.first_name }} {{user.last_name}}

+Edit Student Information +
+ {{ delete_form.hidden_tag() }} + +
+{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/users/templates/users/welcome.html b/Unit-02/01-blueprints/project/users/templates/users/welcome.html new file mode 100644 index 0000000..0a551d5 --- /dev/null +++ b/Unit-02/01-blueprints/project/users/templates/users/welcome.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} {% block content %} +

Welcome!

+ + +{% endblock %} \ No newline at end of file diff --git a/Unit-02/01-blueprints/project/users/views.py b/Unit-02/01-blueprints/project/users/views.py new file mode 100644 index 0000000..fe7aebc --- /dev/null +++ b/Unit-02/01-blueprints/project/users/views.py @@ -0,0 +1,117 @@ +# we will import much more later +from flask import Blueprint, render_template, url_for, redirect, flash, request, session +from project.users.forms import UserForm, DeleteForm, LoginForm +from project.models import User +from project import db, bcrypt +from functools import wraps + +from sqlalchemy.exc import IntegrityError + +# let's create the owners_blueprint to register in our __init__.py +users_blueprint = Blueprint( + 'users', + __name__, + template_folder='templates/users' +) + + +def ensure_logged_in(fn): + @wraps(fn) + def wrapper(*args, **kwargs): + if not session.get('user_id'): + flash("Please log in first") + return redirect(url_for('users.login')) + return fn(*args, **kwargs) + return wrapper + + +@users_blueprint.route("/", methods=["GET", "POST"]) +def index(): + form = UserForm(request.form) + if request.method == "POST" and form.validate(): + try: + found_user = User.query.filter_by(username=form.username.data).first() + if found_user: + flash("Invalid Credentials") + new_user = User(form.data['first_name'], form.data['last_name'], form.data['username'], form.data['password']) + db.session.add(new_user) + db.session.commit() + return render_template("welcome.html") + except IntegrityError as e: + return render_template("new.html", form=form) + return render_template("index.html", users=User.query.all()) + + # form = UserForm(request.form) + # if request.method == "POST" and form.validate(): + # try: + # new_user = User(form.data['username'], form.data['password']) + # db.session.add(new_user) + # db.session.commit() + # except IntegrityError as e: + # return render_template('signup.html', form=form) + # return redirect(url_for('users.login')) + # return render_template('signup.html', form=form) + + +@users_blueprint.route("/new") +def new(): + user_form = UserForm() + return render_template('new.html', form=user_form) + + +@users_blueprint.route("/login", methods=["GET", "POST"]) +def login(): + login_form = LoginForm(request.form) + if request.method == "POST" and login_form.validate(): + found_user = User.query.filter_by( + username=login_form.username.data).first() + if found_user: + authenticated_user = bcrypt.check_password_hash( + found_user.password, login_form.password.data) + if authenticated_user: + session['user_id'] = found_user.id + return redirect(url_for('users.welcome')) + else: + flash('Invalid Credentials') + return render_template('login.html', form=login_form) + + +@users_blueprint.route("/welcome") +@ensure_logged_in +def welcome(): + return render_template('welcome.html') + +@users_blueprint.route('/logout') +def logout(): + session.pop('user_id', None) + flash('You have been signed out.') + return redirect(url_for('users.login')) + +@users_blueprint.route("/", methods=["GET", "PATCH", "DELETE"]) +def show(id): + delete_form = DeleteForm(request.form) + found_user = User.query.get(id) + if request.method == b"PATCH": + form = UserForm(request.form) + if form.validate(): + found_user.first_name = request.form.get('first_name') + found_user.last_name = request.form.get('last_name') + db.session.add(found_user) + db.session.commit() + flash("User Updated!!!") + return redirect(url_for('users.index')) + return render_template("edit.html", user=found_user, form=user_form) + if request.method == b"DELETE": + if delete_form.validate(): + db.session.delete(found_user) + db.session.commit() + flash("User Deleted!!!") + return redirect(url_for('users.index')) + return render_template("show.html", user=found_user, delete_form=delete_form) + + +@users_blueprint.route("//edit") +def edit(id): + found_user = User.query.get(id) + user_form = UserForm(obj=found_user) + return render_template("edit.html", user=found_user, form=user_form) diff --git a/Unit-02/01-blueprints/requirements.txt b/Unit-02/01-blueprints/requirements.txt new file mode 100644 index 0000000..4796ef1 --- /dev/null +++ b/Unit-02/01-blueprints/requirements.txt @@ -0,0 +1,19 @@ +alembic==0.9.6 +click==6.7 +Flask==0.12.2 +Flask-Migrate==2.1.1 +Flask-Modus==0.0.1 +Flask-Script==2.0.6 +Flask-SQLAlchemy==2.3.2 +Flask-WTF==0.14.2 +itsdangerous==0.24 +Jinja2==2.10 +Mako==1.0.7 +MarkupSafe==1.0 +psycopg2==2.7.3.2 +python-dateutil==2.6.1 +python-editor==1.0.3 +six==1.11.0 +SQLAlchemy==1.1.15 +Werkzeug==0.12.2 +WTForms==2.1