From 92849e0d91d2a29e6d5de8d9bb1233c105623455 Mon Sep 17 00:00:00 2001 From: rebel_skum Date: Mon, 18 Dec 2017 21:28:01 -0800 Subject: [PATCH 1/4] duplicating files over from 09-forms for refactoring --- Unit-02/01-blueprints/app.py | 160 ++++++++++++++++++ Unit-02/01-blueprints/forms.py | 14 ++ Unit-02/01-blueprints/manage.py | 13 ++ 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/d133f7ee8b3c_.py | 34 ++++ Unit-02/01-blueprints/readme.md | 13 +- Unit-02/01-blueprints/templates/base.html | 19 +++ .../templates/messages/edit.html | 27 +++ .../templates/messages/index.html | 33 ++++ .../01-blueprints/templates/messages/new.html | 28 +++ .../templates/messages/show.html | 1 + .../01-blueprints/templates/users/edit.html | 24 +++ .../01-blueprints/templates/users/index.html | 28 +++ .../01-blueprints/templates/users/new.html | 26 +++ .../01-blueprints/templates/users/show.html | 21 +++ 18 files changed, 597 insertions(+), 1 deletion(-) create mode 100644 Unit-02/01-blueprints/app.py create mode 100644 Unit-02/01-blueprints/forms.py 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/d133f7ee8b3c_.py create mode 100644 Unit-02/01-blueprints/templates/base.html create mode 100644 Unit-02/01-blueprints/templates/messages/edit.html create mode 100644 Unit-02/01-blueprints/templates/messages/index.html create mode 100644 Unit-02/01-blueprints/templates/messages/new.html create mode 100644 Unit-02/01-blueprints/templates/messages/show.html create mode 100644 Unit-02/01-blueprints/templates/users/edit.html create mode 100644 Unit-02/01-blueprints/templates/users/index.html create mode 100644 Unit-02/01-blueprints/templates/users/new.html create mode 100644 Unit-02/01-blueprints/templates/users/show.html diff --git a/Unit-02/01-blueprints/app.py b/Unit-02/01-blueprints/app.py new file mode 100644 index 0000000..ba54014 --- /dev/null +++ b/Unit-02/01-blueprints/app.py @@ -0,0 +1,160 @@ +from flask import Flask, render_template, redirect, url_for, request +from flask_sqlalchemy import SQLAlchemy #step 1: pip install flask_sqlalchemy psycopg2 +from flask_modus import Modus +from forms import UserForm, MessageForm, DeleteForm +import os + + + + +app = Flask(__name__) +#step 2: app.config to cofig to correct database +app.config['SQLALCHEMY_DATABASE_URI'] = "postgres://localhost/flask-user-app" +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY') +modus = Modus(app) +db = SQLAlchemy(app) + + +#set up our table +class User(db.Model): + + __tablename__ = "users" + + id = db.Column(db.Integer, primary_key=True) + 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): + self.first_name = first_name + self.last_name = 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 + + + +@app.route('/') +def root(): + return redirect(url_for('index')) + +@app.route('/users', methods=["GET", "POST"]) +def index(): + delete_form = DeleteForm() + if request.method == "POST": + form = UserForm(request.form) + if form.validate(): + new_user = User(request.form['first_name'], request.form['last_name']) # name from type in new.html# + db.session.add(new_user) + db.session.commit() + return redirect(url_for('index')) + else: + return render_template('users/new.html', form=form) + return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) + + + +@app.route('/users/new') +def new(): + user_form = UserForm() + return render_template('users/new.html', form=user_form) + + + +@app.route('/users/', methods=["GET", "PATCH", "DELETE"]) +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() + return redirect(url_for('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() + return redirect(url_for('index')) + return render_template('users/show.html', user=found_user) + + +@app.route('/users//edit') +def edit(id): + #refactored using a list comprehension + found_user = User.query.get(id) + user_form = UserForm(obj=found_user) #do not use request.form, use obj= to prepopulate the form + return render_template('users/edit.html', user=found_user, form=user_form) + + + + +@app.route('/users//messages', methods=["GET", "POST"]) +def messages_index(user_id): + delete_form = DeleteForm() + if request.method == "POST": + message_form = MessageForm(request.form) + if message_form.validate(): + new_message = Message(request.form['content'], user_id) + db.session.add(new_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id, form=message_form)) + else: + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) + +@app.route('/users//messages/new') +def messages_new(user_id): + message_form = MessageForm(request.form) + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + +@app.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) +def messages_show(user_id, id): + found_message = Message.query.get(id) + + if request.method == b'PATCH': + message_form = MessageForm(request.form) + if message_form.validate(): + found_message.content = request.form['content'] + db.session.add(found_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id)) + return render_template('messages/edit.html', message=found_message, form=message_form) + + elif request.method == b'DELETE': + delete_form = DeleteForm(request.form) + if delete_form.validate(): + db.session.delete(found_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id)) + return render_template('messages/show.html', message=found_message, form=message_form) + +@app.route('/users//messages//edit') +def messages_edit(user_id, id): + found_message = Message.query.get(id) + message_form = MessageForm(obj=found_message) + return render_template('messages/edit.html', message=found_message, form=message_form) + + + + + + + +if __name__ == '__main__': + app.run(debug=True, port=3000) diff --git a/Unit-02/01-blueprints/forms.py b/Unit-02/01-blueprints/forms.py new file mode 100644 index 0000000..b2c553d --- /dev/null +++ b/Unit-02/01-blueprints/forms.py @@ -0,0 +1,14 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, validators + +class UserForm(FlaskForm): + first_name = StringField('First Name', [validators.DataRequired()]) + last_name = StringField('Last Name', [validators.DataRequired()]) + + +class MessageForm(FlaskForm): + content = StringField('Content', [validators.DataRequired()]) + + +class DeleteForm(FlaskForm): + pass diff --git a/Unit-02/01-blueprints/manage.py b/Unit-02/01-blueprints/manage.py new file mode 100644 index 0000000..c51dfa7 --- /dev/null +++ b/Unit-02/01-blueprints/manage.py @@ -0,0 +1,13 @@ +from app 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) # python manage.py db + +if __name__ == '__main__': + manager.run() 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/d133f7ee8b3c_.py b/Unit-02/01-blueprints/migrations/versions/d133f7ee8b3c_.py new file mode 100644 index 0000000..3a1e8b8 --- /dev/null +++ b/Unit-02/01-blueprints/migrations/versions/d133f7ee8b3c_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: d133f7ee8b3c +Revises: +Create Date: 2017-12-09 19:11:57.347109 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd133f7ee8b3c' +down_revision = None +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/01-blueprints/readme.md b/Unit-02/01-blueprints/readme.md index afe8a3c..aeebe73 100644 --- a/Unit-02/01-blueprints/readme.md +++ b/Unit-02/01-blueprints/readme.md @@ -1,11 +1,22 @@ -# Blueprints +# Blueprints ### Part I - Questions 1. Describe the MVC pattern. +#ANSWER: MVC stands for model, view, and controller. Models are responsible for data storage. +#Views is what our user sees and a minimal amout of logic for our controller is at. +#Controller is where all of our logic is at. The controller is responsible for updating the view by communicating to the model. + 2. In the MVC pattern, does the model communicate directly with the view? +#ANSWER: no, it goes through the controller and the controller is where the actions are processed to update the View from retrieving data from the model + 2. What is the purpose of blueprints? +#ANSWER: the purpose of blueprints is to organize our configuration settings, database logic and routing logic in a more structured folder system rather than storing it all in a single file (app.py) + + 3. How does using blueprints help us organize bigger applications? +#ANSWER: it reduces the amount of code in the app.py file by making the folder structure larger and a little more specific. + ### Part II - Exercise diff --git a/Unit-02/01-blueprints/templates/base.html b/Unit-02/01-blueprints/templates/base.html new file mode 100644 index 0000000..d658833 --- /dev/null +++ b/Unit-02/01-blueprints/templates/base.html @@ -0,0 +1,19 @@ + + + + + + + Users CRUD App + + + +
+ + + Home + {% block content %} + {% endblock %} +
+ + diff --git a/Unit-02/01-blueprints/templates/messages/edit.html b/Unit-02/01-blueprints/templates/messages/edit.html new file mode 100644 index 0000000..8eb0d09 --- /dev/null +++ b/Unit-02/01-blueprints/templates/messages/edit.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% block content %} +

Edit Your 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 %} diff --git a/Unit-02/01-blueprints/templates/messages/index.html b/Unit-02/01-blueprints/templates/messages/index.html new file mode 100644 index 0000000..41fd6bc --- /dev/null +++ b/Unit-02/01-blueprints/templates/messages/index.html @@ -0,0 +1,33 @@ +{% extends "base.html" %} +{% block content %} + +

Messages for {{user.first_name}}

+ + Add A New Message + + +

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

+ + +
+
+ {{message.content}} + +

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

+ + {% endfor %} + + +{% endblock %} diff --git a/Unit-02/01-blueprints/templates/messages/new.html b/Unit-02/01-blueprints/templates/messages/new.html new file mode 100644 index 0000000..690f556 --- /dev/null +++ b/Unit-02/01-blueprints/templates/messages/new.html @@ -0,0 +1,28 @@ +{% extends 'base.html' %} +{% block content %} + +

Add A Message 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 %} diff --git a/Unit-02/01-blueprints/templates/messages/show.html b/Unit-02/01-blueprints/templates/messages/show.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Unit-02/01-blueprints/templates/messages/show.html @@ -0,0 +1 @@ + diff --git a/Unit-02/01-blueprints/templates/users/edit.html b/Unit-02/01-blueprints/templates/users/edit.html new file mode 100644 index 0000000..87da137 --- /dev/null +++ b/Unit-02/01-blueprints/templates/users/edit.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} +{% block content %} + +
+ {{ 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 %} diff --git a/Unit-02/01-blueprints/templates/users/index.html b/Unit-02/01-blueprints/templates/users/index.html new file mode 100644 index 0000000..0bb1fd1 --- /dev/null +++ b/Unit-02/01-blueprints/templates/users/index.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} +{% block content %} + + + +

See all the Users!

+
+ Add A New User + + +{% endblock %} diff --git a/Unit-02/01-blueprints/templates/users/new.html b/Unit-02/01-blueprints/templates/users/new.html new file mode 100644 index 0000000..2a55f83 --- /dev/null +++ b/Unit-02/01-blueprints/templates/users/new.html @@ -0,0 +1,26 @@ +{% extends 'base.html' %} +{% block content %} + +

Add 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 %} diff --git a/Unit-02/01-blueprints/templates/users/show.html b/Unit-02/01-blueprints/templates/users/show.html new file mode 100644 index 0000000..0737ace --- /dev/null +++ b/Unit-02/01-blueprints/templates/users/show.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% block content %} + +

More About This User

+

+ The name of the user is {{user.first_name}} {{user.last_name}} +

+ + See all the users +
+ Edit this user +
+ See user's messages +
+

Delete User

+
+ +
+ + +{% endblock %} From bed4c9ebfd0dc5fe0d198554b19471695c6a1efc Mon Sep 17 00:00:00 2001 From: rebel_skum Date: Mon, 18 Dec 2017 22:50:53 -0800 Subject: [PATCH 2/4] updating blueprints folder structure, refactoring app.py and models.py --- Unit-02/01-blueprints/app.py | 156 +----------------- Unit-02/01-blueprints/manage.py | 4 +- Unit-02/01-blueprints/project/__init__.py | 130 +++++++++++++++ .../01-blueprints/project/messages/forms.py | 0 .../messages}/templates/messages/edit.html | 0 .../messages}/templates/messages/index.html | 0 .../messages}/templates/messages/new.html | 0 .../messages}/templates/messages/show.html | 0 .../01-blueprints/project/messages/views.py | 7 + Unit-02/01-blueprints/project/models.py | 27 +++ .../{ => project}/templates/base.html | 0 .../{ => project/users}/forms.py | 0 .../users}/templates/users/edit.html | 0 .../users}/templates/users/index.html | 0 .../users}/templates/users/new.html | 0 .../users}/templates/users/show.html | 0 Unit-02/01-blueprints/project/users/views.py | 8 + 17 files changed, 174 insertions(+), 158 deletions(-) create mode 100644 Unit-02/01-blueprints/project/__init__.py create mode 100644 Unit-02/01-blueprints/project/messages/forms.py rename Unit-02/01-blueprints/{ => project/messages}/templates/messages/edit.html (100%) rename Unit-02/01-blueprints/{ => project/messages}/templates/messages/index.html (100%) rename Unit-02/01-blueprints/{ => project/messages}/templates/messages/new.html (100%) rename Unit-02/01-blueprints/{ => project/messages}/templates/messages/show.html (100%) create mode 100644 Unit-02/01-blueprints/project/messages/views.py create mode 100644 Unit-02/01-blueprints/project/models.py rename Unit-02/01-blueprints/{ => project}/templates/base.html (100%) rename Unit-02/01-blueprints/{ => project/users}/forms.py (100%) rename Unit-02/01-blueprints/{ => project/users}/templates/users/edit.html (100%) rename Unit-02/01-blueprints/{ => project/users}/templates/users/index.html (100%) rename Unit-02/01-blueprints/{ => project/users}/templates/users/new.html (100%) rename Unit-02/01-blueprints/{ => project/users}/templates/users/show.html (100%) create mode 100644 Unit-02/01-blueprints/project/users/views.py diff --git a/Unit-02/01-blueprints/app.py b/Unit-02/01-blueprints/app.py index ba54014..a21bf99 100644 --- a/Unit-02/01-blueprints/app.py +++ b/Unit-02/01-blueprints/app.py @@ -1,158 +1,4 @@ -from flask import Flask, render_template, redirect, url_for, request -from flask_sqlalchemy import SQLAlchemy #step 1: pip install flask_sqlalchemy psycopg2 -from flask_modus import Modus -from forms import UserForm, MessageForm, DeleteForm -import os - - - - -app = Flask(__name__) -#step 2: app.config to cofig to correct database -app.config['SQLALCHEMY_DATABASE_URI'] = "postgres://localhost/flask-user-app" -app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False -app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY') -modus = Modus(app) -db = SQLAlchemy(app) - - -#set up our table -class User(db.Model): - - __tablename__ = "users" - - id = db.Column(db.Integer, primary_key=True) - 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): - self.first_name = first_name - self.last_name = 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 - - - -@app.route('/') -def root(): - return redirect(url_for('index')) - -@app.route('/users', methods=["GET", "POST"]) -def index(): - delete_form = DeleteForm() - if request.method == "POST": - form = UserForm(request.form) - if form.validate(): - new_user = User(request.form['first_name'], request.form['last_name']) # name from type in new.html# - db.session.add(new_user) - db.session.commit() - return redirect(url_for('index')) - else: - return render_template('users/new.html', form=form) - return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) - - - -@app.route('/users/new') -def new(): - user_form = UserForm() - return render_template('users/new.html', form=user_form) - - - -@app.route('/users/', methods=["GET", "PATCH", "DELETE"]) -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() - return redirect(url_for('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() - return redirect(url_for('index')) - return render_template('users/show.html', user=found_user) - - -@app.route('/users//edit') -def edit(id): - #refactored using a list comprehension - found_user = User.query.get(id) - user_form = UserForm(obj=found_user) #do not use request.form, use obj= to prepopulate the form - return render_template('users/edit.html', user=found_user, form=user_form) - - - - -@app.route('/users//messages', methods=["GET", "POST"]) -def messages_index(user_id): - delete_form = DeleteForm() - if request.method == "POST": - message_form = MessageForm(request.form) - if message_form.validate(): - new_message = Message(request.form['content'], user_id) - db.session.add(new_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id, form=message_form)) - else: - return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) - return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) - -@app.route('/users//messages/new') -def messages_new(user_id): - message_form = MessageForm(request.form) - return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) - -@app.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) -def messages_show(user_id, id): - found_message = Message.query.get(id) - - if request.method == b'PATCH': - message_form = MessageForm(request.form) - if message_form.validate(): - found_message.content = request.form['content'] - db.session.add(found_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id)) - return render_template('messages/edit.html', message=found_message, form=message_form) - - elif request.method == b'DELETE': - delete_form = DeleteForm(request.form) - if delete_form.validate(): - db.session.delete(found_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id)) - return render_template('messages/show.html', message=found_message, form=message_form) - -@app.route('/users//messages//edit') -def messages_edit(user_id, id): - found_message = Message.query.get(id) - message_form = MessageForm(obj=found_message) - return render_template('messages/edit.html', message=found_message, form=message_form) - - - - +from project import app diff --git a/Unit-02/01-blueprints/manage.py b/Unit-02/01-blueprints/manage.py index c51dfa7..2f154d1 100644 --- a/Unit-02/01-blueprints/manage.py +++ b/Unit-02/01-blueprints/manage.py @@ -1,12 +1,10 @@ -from app import app, db +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) # python manage.py db if __name__ == '__main__': diff --git a/Unit-02/01-blueprints/project/__init__.py b/Unit-02/01-blueprints/project/__init__.py new file mode 100644 index 0000000..9fdb727 --- /dev/null +++ b/Unit-02/01-blueprints/project/__init__.py @@ -0,0 +1,130 @@ +from flask import Flask, render_template, redirect, url_for, request +from flask_sqlalchemy import SQLAlchemy #step 1: pip install flask_sqlalchemy psycopg2 +from flask_modus import Modus +from forms import UserForm, MessageForm, DeleteForm +import os + + + + +app = Flask(__name__) +#step 2: app.config to cofig to correct database +app.config['SQLALCHEMY_DATABASE_URI'] = "postgres://localhost/flask-user-app" +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='/owners') +app.regiester_blueprint(messages_blueprint, url_prefix='/messages') + + + +@app.route('/') +def root(): + return redirect(url_for('index')) + +@app.route('/users', methods=["GET", "POST"]) +def index(): + delete_form = DeleteForm() + if request.method == "POST": + form = UserForm(request.form) + if form.validate(): + new_user = User(request.form['first_name'], request.form['last_name']) # name from type in new.html# + db.session.add(new_user) + db.session.commit() + return redirect(url_for('index')) + else: + return render_template('users/new.html', form=form) + return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) + + + +@app.route('/users/new') +def new(): + user_form = UserForm() + return render_template('users/new.html', form=user_form) + + + +@app.route('/users/', methods=["GET", "PATCH", "DELETE"]) +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() + return redirect(url_for('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() + return redirect(url_for('index')) + return render_template('users/show.html', user=found_user) + + +@app.route('/users//edit') +def edit(id): + #refactored using a list comprehension + found_user = User.query.get(id) + user_form = UserForm(obj=found_user) #do not use request.form, use obj= to prepopulate the form + return render_template('users/edit.html', user=found_user, form=user_form) + + + + +@app.route('/users//messages', methods=["GET", "POST"]) +def messages_index(user_id): + delete_form = DeleteForm() + if request.method == "POST": + message_form = MessageForm(request.form) + if message_form.validate(): + new_message = Message(request.form['content'], user_id) + db.session.add(new_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id, form=message_form)) + else: + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) + +@app.route('/users//messages/new') +def messages_new(user_id): + message_form = MessageForm(request.form) + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + +@app.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) +def messages_show(user_id, id): + found_message = Message.query.get(id) + + if request.method == b'PATCH': + message_form = MessageForm(request.form) + if message_form.validate(): + found_message.content = request.form['content'] + db.session.add(found_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id)) + return render_template('messages/edit.html', message=found_message, form=message_form) + + elif request.method == b'DELETE': + delete_form = DeleteForm(request.form) + if delete_form.validate(): + db.session.delete(found_message) + db.session.commit() + return redirect(url_for('messages_index', user_id=user_id)) + return render_template('messages/show.html', message=found_message, form=message_form) + +@app.route('/users//messages//edit') +def messages_edit(user_id, id): + found_message = Message.query.get(id) + message_form = MessageForm(obj=found_message) + return render_template('messages/edit.html', message=found_message, form=message_form) 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..e69de29 diff --git a/Unit-02/01-blueprints/templates/messages/edit.html b/Unit-02/01-blueprints/project/messages/templates/messages/edit.html similarity index 100% rename from Unit-02/01-blueprints/templates/messages/edit.html rename to Unit-02/01-blueprints/project/messages/templates/messages/edit.html diff --git a/Unit-02/01-blueprints/templates/messages/index.html b/Unit-02/01-blueprints/project/messages/templates/messages/index.html similarity index 100% rename from Unit-02/01-blueprints/templates/messages/index.html rename to Unit-02/01-blueprints/project/messages/templates/messages/index.html diff --git a/Unit-02/01-blueprints/templates/messages/new.html b/Unit-02/01-blueprints/project/messages/templates/messages/new.html similarity index 100% rename from Unit-02/01-blueprints/templates/messages/new.html rename to Unit-02/01-blueprints/project/messages/templates/messages/new.html diff --git a/Unit-02/01-blueprints/templates/messages/show.html b/Unit-02/01-blueprints/project/messages/templates/messages/show.html similarity index 100% rename from Unit-02/01-blueprints/templates/messages/show.html rename to Unit-02/01-blueprints/project/messages/templates/messages/show.html 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..929e699 --- /dev/null +++ b/Unit-02/01-blueprints/project/messages/views.py @@ -0,0 +1,7 @@ +from flask import Blueprint + +messages_blueprint = Blueprint( + 'messages', + __name__, + template_folder='templates' +) diff --git a/Unit-02/01-blueprints/project/models.py b/Unit-02/01-blueprints/project/models.py new file mode 100644 index 0000000..27a0d0b --- /dev/null +++ b/Unit-02/01-blueprints/project/models.py @@ -0,0 +1,27 @@ +from project import db + +class User(db.Model): + + __tablename__ = "users" + + id = db.Column(db.Integer, primary_key=True) + 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): + self.first_name = first_name + self.last_name = 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/templates/base.html b/Unit-02/01-blueprints/project/templates/base.html similarity index 100% rename from Unit-02/01-blueprints/templates/base.html rename to Unit-02/01-blueprints/project/templates/base.html diff --git a/Unit-02/01-blueprints/forms.py b/Unit-02/01-blueprints/project/users/forms.py similarity index 100% rename from Unit-02/01-blueprints/forms.py rename to Unit-02/01-blueprints/project/users/forms.py diff --git a/Unit-02/01-blueprints/templates/users/edit.html b/Unit-02/01-blueprints/project/users/templates/users/edit.html similarity index 100% rename from Unit-02/01-blueprints/templates/users/edit.html rename to Unit-02/01-blueprints/project/users/templates/users/edit.html diff --git a/Unit-02/01-blueprints/templates/users/index.html b/Unit-02/01-blueprints/project/users/templates/users/index.html similarity index 100% rename from Unit-02/01-blueprints/templates/users/index.html rename to Unit-02/01-blueprints/project/users/templates/users/index.html diff --git a/Unit-02/01-blueprints/templates/users/new.html b/Unit-02/01-blueprints/project/users/templates/users/new.html similarity index 100% rename from Unit-02/01-blueprints/templates/users/new.html rename to Unit-02/01-blueprints/project/users/templates/users/new.html diff --git a/Unit-02/01-blueprints/templates/users/show.html b/Unit-02/01-blueprints/project/users/templates/users/show.html similarity index 100% rename from Unit-02/01-blueprints/templates/users/show.html rename to Unit-02/01-blueprints/project/users/templates/users/show.html 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..0d55c5e --- /dev/null +++ b/Unit-02/01-blueprints/project/users/views.py @@ -0,0 +1,8 @@ +from flask import Blueprint +from project.users.models import User + +users_blueprint = BLueprint( + 'users', + __name__' + template_folder='templates' +) From fbcf6f3f65f0e745b7df5e266b3c169168b66add Mon Sep 17 00:00:00 2001 From: rebel_skum Date: Sat, 30 Dec 2017 20:31:32 -0500 Subject: [PATCH 3/4] updating blueprints to files --- Unit-02/01-blueprints/project/__init__.py | 111 +----------------- .../01-blueprints/project/messages/forms.py | 14 +++ .../01-blueprints/project/messages/views.py | 54 ++++++++- .../01-blueprints/project/templates/base.html | 14 +++ .../project/users/templates/users/index.html | 8 +- Unit-02/01-blueprints/project/users/views.py | 66 ++++++++++- 6 files changed, 151 insertions(+), 116 deletions(-) diff --git a/Unit-02/01-blueprints/project/__init__.py b/Unit-02/01-blueprints/project/__init__.py index 9fdb727..43ec993 100644 --- a/Unit-02/01-blueprints/project/__init__.py +++ b/Unit-02/01-blueprints/project/__init__.py @@ -1,7 +1,6 @@ -from flask import Flask, render_template, redirect, url_for, request +from flask import Flask, redirect, url_for from flask_sqlalchemy import SQLAlchemy #step 1: pip install flask_sqlalchemy psycopg2 from flask_modus import Modus -from forms import UserForm, MessageForm, DeleteForm import os @@ -18,113 +17,11 @@ from project.users.views import users_blueprint from project.messages.views import messages_blueprint -app.register_blueprint(users_blueprint, url_prefix='/owners') -app.regiester_blueprint(messages_blueprint, url_prefix='/messages') +app.register_blueprint(users_blueprint, url_prefix='/users') +app.regiester_blueprint(messages_blueprint, url_prefix='/users//messages') @app.route('/') def root(): - return redirect(url_for('index')) - -@app.route('/users', methods=["GET", "POST"]) -def index(): - delete_form = DeleteForm() - if request.method == "POST": - form = UserForm(request.form) - if form.validate(): - new_user = User(request.form['first_name'], request.form['last_name']) # name from type in new.html# - db.session.add(new_user) - db.session.commit() - return redirect(url_for('index')) - else: - return render_template('users/new.html', form=form) - return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) - - - -@app.route('/users/new') -def new(): - user_form = UserForm() - return render_template('users/new.html', form=user_form) - - - -@app.route('/users/', methods=["GET", "PATCH", "DELETE"]) -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() - return redirect(url_for('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() - return redirect(url_for('index')) - return render_template('users/show.html', user=found_user) - - -@app.route('/users//edit') -def edit(id): - #refactored using a list comprehension - found_user = User.query.get(id) - user_form = UserForm(obj=found_user) #do not use request.form, use obj= to prepopulate the form - return render_template('users/edit.html', user=found_user, form=user_form) - - - - -@app.route('/users//messages', methods=["GET", "POST"]) -def messages_index(user_id): - delete_form = DeleteForm() - if request.method == "POST": - message_form = MessageForm(request.form) - if message_form.validate(): - new_message = Message(request.form['content'], user_id) - db.session.add(new_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id, form=message_form)) - else: - return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) - return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) - -@app.route('/users//messages/new') -def messages_new(user_id): - message_form = MessageForm(request.form) - return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) - -@app.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) -def messages_show(user_id, id): - found_message = Message.query.get(id) - - if request.method == b'PATCH': - message_form = MessageForm(request.form) - if message_form.validate(): - found_message.content = request.form['content'] - db.session.add(found_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id)) - return render_template('messages/edit.html', message=found_message, form=message_form) - - elif request.method == b'DELETE': - delete_form = DeleteForm(request.form) - if delete_form.validate(): - db.session.delete(found_message) - db.session.commit() - return redirect(url_for('messages_index', user_id=user_id)) - return render_template('messages/show.html', message=found_message, form=message_form) - -@app.route('/users//messages//edit') -def messages_edit(user_id, id): - found_message = Message.query.get(id) - message_form = MessageForm(obj=found_message) - return render_template('messages/edit.html', message=found_message, form=message_form) + 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 index e69de29..b2c553d 100644 --- a/Unit-02/01-blueprints/project/messages/forms.py +++ b/Unit-02/01-blueprints/project/messages/forms.py @@ -0,0 +1,14 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, validators + +class UserForm(FlaskForm): + first_name = StringField('First Name', [validators.DataRequired()]) + last_name = StringField('Last Name', [validators.DataRequired()]) + + +class MessageForm(FlaskForm): + content = StringField('Content', [validators.DataRequired()]) + + +class DeleteForm(FlaskForm): + pass diff --git a/Unit-02/01-blueprints/project/messages/views.py b/Unit-02/01-blueprints/project/messages/views.py index 929e699..ec403ae 100644 --- a/Unit-02/01-blueprints/project/messages/views.py +++ b/Unit-02/01-blueprints/project/messages/views.py @@ -1,7 +1,59 @@ -from flask import Blueprint +from flask import redirect, render_template, request, url_for, flash, Blueprint +from project.models import Message, User +from project.messages.forms import MessageForm, DeleteForm +from project import db messages_blueprint = Blueprint( 'messages', __name__, template_folder='templates' ) + +@messages_blueprint.route('/users//messages', methods=["GET", "POST"]) +def index(user_id): + delete_form = DeleteForm() + if request.method == "POST": + message_form = MessageForm(request.form) + if message_form.validate(): + 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, form=message_form)) + else: + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) + +@messages_blueprint.route('/users//messages/new') +def new(user_id): + message_form = MessageForm(request.form) + return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) + +@messages_blueprint.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) +def show(user_id, id): + found_message = Message.query.get(id) + + if request.method == b'PATCH': + message_form = MessageForm(request.form) + if message_form.validate(): + found_message.content = request.form['content'] + db.session.add(found_message) + db.session.commit() + flash('Message Updated!') + return redirect(url_for('users.index', user_id=user_id)) + return render_template('messages/edit.html', message=found_message, form=message_form) + + elif 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, form=message_form) + +@messages_blueprint.route('/users//messages//edit') +def edit(user_id, id): + found_message = Message.query.get(id) + message_form = MessageForm(obj=found_message) + return render_template('messages/edit.html', message=found_message, form=message_form) diff --git a/Unit-02/01-blueprints/project/templates/base.html b/Unit-02/01-blueprints/project/templates/base.html index d658833..a7c3a62 100644 --- a/Unit-02/01-blueprints/project/templates/base.html +++ b/Unit-02/01-blueprints/project/templates/base.html @@ -12,6 +12,20 @@ Home + {% with messages = get_flashed_messages()%} + {% if messages %} + {% for message in messages %} + +

{{ message }}

+ + {% endfor %} + {% endif %} + {% endwith %} + + + blockofcode + {% endif %} + {% block content %} {% endblock %} diff --git a/Unit-02/01-blueprints/project/users/templates/users/index.html b/Unit-02/01-blueprints/project/users/templates/users/index.html index 0bb1fd1..a85f6c3 100644 --- a/Unit-02/01-blueprints/project/users/templates/users/index.html +++ b/Unit-02/01-blueprints/project/users/templates/users/index.html @@ -5,7 +5,7 @@

See all the Users!


- Add A New User + Add A New User
    {% for user in users %} @@ -15,10 +15,10 @@

    - See all messages for {{user.first_name}}! + See all messages for {{user.first_name}}!
    - -
    {{ delete_form.hidden_tag()}} + + {{ delete_form.hidden_tag()}}
    diff --git a/Unit-02/01-blueprints/project/users/views.py b/Unit-02/01-blueprints/project/users/views.py index 0d55c5e..3fb0caa 100644 --- a/Unit-02/01-blueprints/project/users/views.py +++ b/Unit-02/01-blueprints/project/users/views.py @@ -1,8 +1,66 @@ -from flask import Blueprint -from project.users.models import User +from flask import redirect, render_template, request, url_for, flash, Blueprint +from project.models import User +from project.users.forms import UserForm, DeleteForm +from project import db -users_blueprint = BLueprint( +users_blueprint = Blueprint( 'users', - __name__' + __name__, template_folder='templates' ) + +@users_blueprint.route('/', methods=["GET", "POST"]) +def index(): + delete_form = DeleteForm() + if request.method == "POST": + form = UserForm(request.form) + if form.validate(): + new_user = User(request.form['first_name'], request.form['last_name']) # name from type in new.html# + db.session.add(new_user) + db.session.commit() + flash('User Created!') + return redirect(url_for('index')) + else: + return render_template('users/new.html', form=form) + return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) + + + +@users_blueprint.route('/new') +def new(): + user_form = UserForm() + return render_template('users/new.html', form=user_form) + + + +@users_blueprint.route('/', methods=["GET", "PATCH", "DELETE"]) +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('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() + flash('User Deleted!') + return redirect(url_for('index')) + return render_template('users/show.html', user=found_user) + + +@users_blueprint.route('//edit') +def edit(id): + #refactored using a list comprehension + found_user = User.query.get(id) + user_form = UserForm(obj=found_user) #do not use request.form, use obj= to prepopulate the form + return render_template('users/edit.html', user=found_user, form=user_form) From 59ce33ab54175555b42fb4e77491b74436f6c51c Mon Sep 17 00:00:00 2001 From: rebel_skum Date: Wed, 3 Jan 2018 19:09:58 -0800 Subject: [PATCH 4/4] completed refactoring using blueprints flask --- Unit-02/01-blueprints/app.py | 2 +- Unit-02/01-blueprints/project/__init__.py | 2 +- .../project/messages/templates/messages/edit.html | 2 +- .../project/messages/templates/messages/index.html | 6 +++--- .../project/messages/templates/messages/new.html | 2 +- Unit-02/01-blueprints/project/messages/views.py | 8 ++++---- Unit-02/01-blueprints/project/templates/base.html | 6 +----- .../01-blueprints/project/users/templates/users/edit.html | 2 +- .../project/users/templates/users/index.html | 2 +- .../01-blueprints/project/users/templates/users/new.html | 4 ++-- .../01-blueprints/project/users/templates/users/show.html | 8 ++++---- Unit-02/01-blueprints/project/users/views.py | 6 +++--- 12 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Unit-02/01-blueprints/app.py b/Unit-02/01-blueprints/app.py index a21bf99..3d6fb59 100644 --- a/Unit-02/01-blueprints/app.py +++ b/Unit-02/01-blueprints/app.py @@ -3,4 +3,4 @@ if __name__ == '__main__': - app.run(debug=True, port=3000) + app.run(debug=True, port=9000) diff --git a/Unit-02/01-blueprints/project/__init__.py b/Unit-02/01-blueprints/project/__init__.py index 43ec993..33097bb 100644 --- a/Unit-02/01-blueprints/project/__init__.py +++ b/Unit-02/01-blueprints/project/__init__.py @@ -18,7 +18,7 @@ from project.messages.views import messages_blueprint app.register_blueprint(users_blueprint, url_prefix='/users') -app.regiester_blueprint(messages_blueprint, url_prefix='/users//messages') +app.register_blueprint(messages_blueprint, url_prefix='/users//messages') diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/edit.html b/Unit-02/01-blueprints/project/messages/templates/messages/edit.html index 8eb0d09..af91e0d 100644 --- a/Unit-02/01-blueprints/project/messages/templates/messages/edit.html +++ b/Unit-02/01-blueprints/project/messages/templates/messages/edit.html @@ -2,7 +2,7 @@ {% block content %}

    Edit Your Message

    -
    + {{ form.hidden_tag() }} {% for field in form if field.widget.input_type != 'hidden' %} diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/index.html b/Unit-02/01-blueprints/project/messages/templates/messages/index.html index 41fd6bc..34af76e 100644 --- a/Unit-02/01-blueprints/project/messages/templates/messages/index.html +++ b/Unit-02/01-blueprints/project/messages/templates/messages/index.html @@ -3,7 +3,7 @@

    Messages for {{user.first_name}}

    - Add A New Message + Add A New Message

    @@ -18,9 +18,9 @@

    - + - {{ delete_form.hidden_tag()}} + {{ delete_form.hidden_tag()}}
    diff --git a/Unit-02/01-blueprints/project/messages/templates/messages/new.html b/Unit-02/01-blueprints/project/messages/templates/messages/new.html index 690f556..a1e064a 100644 --- a/Unit-02/01-blueprints/project/messages/templates/messages/new.html +++ b/Unit-02/01-blueprints/project/messages/templates/messages/new.html @@ -3,7 +3,7 @@

    Add A Message For {{user.first_name}} {{user.last_name}}

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

    diff --git a/Unit-02/01-blueprints/project/messages/views.py b/Unit-02/01-blueprints/project/messages/views.py index ec403ae..f35c357 100644 --- a/Unit-02/01-blueprints/project/messages/views.py +++ b/Unit-02/01-blueprints/project/messages/views.py @@ -9,7 +9,7 @@ template_folder='templates' ) -@messages_blueprint.route('/users//messages', methods=["GET", "POST"]) +@messages_blueprint.route('/', methods=["GET", "POST"]) def index(user_id): delete_form = DeleteForm() if request.method == "POST": @@ -24,12 +24,12 @@ def index(user_id): return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) return render_template('messages/index.html', user=User.query.get(user_id), delete_form=delete_form) -@messages_blueprint.route('/users//messages/new') +@messages_blueprint.route('/new') def new(user_id): message_form = MessageForm(request.form) return render_template('messages/new.html', user=User.query.get(user_id), form=message_form) -@messages_blueprint.route('/users//messages/', methods=['GET', 'PATCH', 'DELETE']) +@messages_blueprint.route('/', methods=['GET', 'PATCH', 'DELETE']) def show(user_id, id): found_message = Message.query.get(id) @@ -52,7 +52,7 @@ def show(user_id, id): return redirect(url_for('messages.index', user_id=user_id)) return render_template('messages/show.html', message=found_message, form=message_form) -@messages_blueprint.route('/users//messages//edit') +@messages_blueprint.route('//edit') def edit(user_id, id): found_message = Message.query.get(id) message_form = MessageForm(obj=found_message) diff --git a/Unit-02/01-blueprints/project/templates/base.html b/Unit-02/01-blueprints/project/templates/base.html index a7c3a62..dcd38e8 100644 --- a/Unit-02/01-blueprints/project/templates/base.html +++ b/Unit-02/01-blueprints/project/templates/base.html @@ -11,7 +11,7 @@

    - Home + Home {% with messages = get_flashed_messages()%} {% if messages %} {% for message in messages %} @@ -22,10 +22,6 @@ {% endif %} {% endwith %} - - blockofcode - {% endif %} - {% block content %} {% endblock %}
    diff --git a/Unit-02/01-blueprints/project/users/templates/users/edit.html b/Unit-02/01-blueprints/project/users/templates/users/edit.html index 87da137..b4df761 100644 --- a/Unit-02/01-blueprints/project/users/templates/users/edit.html +++ b/Unit-02/01-blueprints/project/users/templates/users/edit.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - + {{ form.hidden_tag() }} {% for field in form if field.widget.input_type != 'hidden' %} diff --git a/Unit-02/01-blueprints/project/users/templates/users/index.html b/Unit-02/01-blueprints/project/users/templates/users/index.html index a85f6c3..7029401 100644 --- a/Unit-02/01-blueprints/project/users/templates/users/index.html +++ b/Unit-02/01-blueprints/project/users/templates/users/index.html @@ -3,7 +3,7 @@ -

    See all the Users!

    +

    See All The Users!


    Add A New User
      diff --git a/Unit-02/01-blueprints/project/users/templates/users/new.html b/Unit-02/01-blueprints/project/users/templates/users/new.html index 2a55f83..949eacd 100644 --- a/Unit-02/01-blueprints/project/users/templates/users/new.html +++ b/Unit-02/01-blueprints/project/users/templates/users/new.html @@ -3,7 +3,7 @@

      Add User

      - + {{ form.hidden_tag() }} {% for field in form if field.widget.input_type != 'hidden' %} @@ -19,7 +19,7 @@

      Add User

      {% endfor %} - + diff --git a/Unit-02/01-blueprints/project/users/templates/users/show.html b/Unit-02/01-blueprints/project/users/templates/users/show.html index 0737ace..8a60d07 100644 --- a/Unit-02/01-blueprints/project/users/templates/users/show.html +++ b/Unit-02/01-blueprints/project/users/templates/users/show.html @@ -6,14 +6,14 @@

      More About This User

      The name of the user is {{user.first_name}} {{user.last_name}}

      - See all the users + See all the users
      - Edit this user + Edit this user
      - See user's messages + See user's messages

      Delete User

      -
      +
      diff --git a/Unit-02/01-blueprints/project/users/views.py b/Unit-02/01-blueprints/project/users/views.py index 3fb0caa..2c023ab 100644 --- a/Unit-02/01-blueprints/project/users/views.py +++ b/Unit-02/01-blueprints/project/users/views.py @@ -19,7 +19,7 @@ def index(): db.session.add(new_user) db.session.commit() flash('User Created!') - return redirect(url_for('index')) + return redirect(url_for('users.index')) else: return render_template('users/new.html', form=form) return render_template('users/index.html', users=User.query.all(), delete_form=delete_form) @@ -45,7 +45,7 @@ def show(id): db.session.add(found_user) db.session.commit() flash('User Updated!') - return redirect(url_for('index')) + return redirect(url_for('users.index')) return render_template('users/edit.html', user=found_user, form=form) if request.method == b"DELETE": @@ -54,7 +54,7 @@ def show(id): db.session.delete(found_user) db.session.commit() flash('User Deleted!') - return redirect(url_for('index')) + return redirect(url_for('users.index')) return render_template('users/show.html', user=found_user)