Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Run PEP8 on content #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
11 changes: 5 additions & 6 deletions app/app.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from models import *
import os

from flask import Flask, request, render_template
Expand All @@ -18,31 +19,29 @@
# initialize database migration management
MIGRATE = Migrate(APP, DB)

from models import *


@APP.route('/')
def view_registered_guests():
guests = Guest.query.all()
return render_template('guest_list.html', guests=guests)


@APP.route('/register', methods = ['GET'])
@APP.route('/register', methods=['GET'])
def view_registration_form():
return render_template('guest_registration.html')


@APP.route('/register', methods = ['POST'])
@APP.route('/register', methods=['POST'])
def register_guest():
name = request.form.get('name')
email = request.form.get('email')
partysize = request.form.get('partysize')
if not partysize or partysize=='':
if not partysize or partysize == '':
partysize = 1

guest = Guest(name, email, partysize)
DB.session.add(guest)
DB.session.commit()

return render_template('guest_confirmation.html',
name=name, email=email, partysize=partysize)
name=name, email=email, partysize=partysize)
3 changes: 2 additions & 1 deletion app/migrations/env.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import with_statement
from flask import current_app
from alembic import context
from sqlalchemy import engine_from_config, pool
from logging.config import fileConfig
Expand All @@ -17,7 +18,6 @@
# 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
Expand Down Expand Up @@ -81,6 +81,7 @@ def process_revision_directives(context, revision, directives):
finally:
connection.close()


if context.is_offline_mode():
run_migrations_offline()
else:
Expand Down
3 changes: 2 additions & 1 deletion app/migrations/versions/32b48058cd02_.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('guests', sa.Column('partysize', sa.Integer(), nullable=True))
op.add_column('guests', sa.Column(
'partysize', sa.Integer(), nullable=True))
# ### end Alembic commands ###


Expand Down
10 changes: 5 additions & 5 deletions app/migrations/versions/791cd7d80402_.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('guests',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=True),
sa.Column('email', sa.String(length=120), nullable=True),
sa.PrimaryKeyConstraint('id')
)
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=True),
sa.Column('email', sa.String(length=120), nullable=True),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


Expand Down
4 changes: 2 additions & 2 deletions app/models.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from app import DB


class Guest(DB.Model):
"""Simple database model to track event attendees."""

__tablename__ = 'guests'
id = DB.Column(DB.Integer, primary_key=True)
name = DB.Column(DB.String(80))
Expand All @@ -13,4 +14,3 @@ def __init__(self, name=None, email=None, partysize=1):
self.name = name
self.email = email
self.partysize = partysize