Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Unit-02/03-hashing-sessions/app.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from project import app

if __name__ == '__main__':
app.run(debug=True,port=3000)


12 changes: 12 additions & 0 deletions Unit-02/03-hashing-sessions/manage.py
Original file line number Diff line number Diff line change
@@ -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()
1 change: 1 addition & 0 deletions Unit-02/03-hashing-sessions/migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
45 changes: 45 additions & 0 deletions Unit-02/03-hashing-sessions/migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -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
87 changes: 87 additions & 0 deletions Unit-02/03-hashing-sessions/migrations/env.py
Original file line number Diff line number Diff line change
@@ -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()
24 changes: 24 additions & 0 deletions Unit-02/03-hashing-sessions/migrations/script.py.mako
Original file line number Diff line number Diff line change
@@ -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"}
32 changes: 32 additions & 0 deletions Unit-02/03-hashing-sessions/migrations/versions/16b913010305_.py
Original file line number Diff line number Diff line change
@@ -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 ###
Original file line number Diff line number Diff line change
@@ -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 ###
Original file line number Diff line number Diff line change
@@ -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 ###
29 changes: 29 additions & 0 deletions Unit-02/03-hashing-sessions/project/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from flask import Flask, redirect, url_for
from flask_sqlalchemy import SQLAlchemy
from flask_modus import Modus
from flask_bcrypt import Bcrypt
import os

app = Flask(__name__)
bcrypt = Bcrypt(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/<int:user_id>/messages')

@app.route('/')
def root():
return redirect(url_for('users.index'))




## WOOOOOOO LETS NEST THESE MESSAGES
30 changes: 30 additions & 0 deletions Unit-02/03-hashing-sessions/project/decorators/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from functools import wraps
from flask import redirect, url_for, session, flash

def ensure_authenticated(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

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 != session.get('user_id'):
flash("Not Authorized")
return redirect(url_for('users.index',id=session.get('user_id')))
return fn(*args, **kwargs)
return wrapper
8 changes: 8 additions & 0 deletions Unit-02/03-hashing-sessions/project/messages/forms.py
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% extends 'base.html' %}

{% block content %}
<h1>Edit a new message!</h1>
<form method="POST" action="{{url_for('messages.show', user_id=message.user_id, id=message.id)}}?_method=PATCH">
{{ form.hidden_tag() }}

{% for field in form if field.widget.input_type != 'hidden' %}
<p>
{{field.label}}
{{field}}
<span>
{% if field.errors %}
{% for error in field.errors %}
{{error}}
{% endfor %}
{% endif %}
</span>
</p>
{% endfor %}
<button>Edit a message!</button>

</form>
{% endblock %}
Loading