|
1 | 1 | import os
|
2 | 2 |
|
3 |
| -from flask import Flask, request, render_template |
| 3 | +from flask import Flask, render_template, request |
4 | 4 | from flask_migrate import Migrate
|
5 | 5 | from flask_sqlalchemy import SQLAlchemy
|
6 | 6 |
|
7 |
| -APP = Flask(__name__) |
8 |
| -APP.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False |
9 | 7 |
|
10 |
| -APP.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql+psycopg2://%s:%s@%s/%s' % ( |
11 |
| - # ARGS.dbuser, ARGS.dbpass, ARGS.dbhost, ARGS.dbname |
12 |
| - os.environ['DBUSER'], os.environ['DBPASS'], os.environ['DBHOST'], os.environ['DBNAME'] |
| 8 | +database_uri = 'postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format( |
| 9 | + dbuser=os.environ['DBUSER'], |
| 10 | + dbpass=os.environ['DBPASS'], |
| 11 | + dbhost=os.environ['DBHOST'], |
| 12 | + dbname=os.environ['DBNAME'] |
| 13 | +) |
| 14 | + |
| 15 | +app = Flask(__name__) |
| 16 | +app.config.update( |
| 17 | + SQLALCHEMY_DATABASE_URI=database_uri, |
| 18 | + SQLALCHEMY_TRACK_MODIFICATIONS=False, |
13 | 19 | )
|
14 | 20 |
|
15 | 21 | # initialize the database connection
|
16 |
| -DB = SQLAlchemy(APP) |
| 22 | +db = SQLAlchemy(app) |
17 | 23 |
|
18 | 24 | # initialize database migration management
|
19 |
| -MIGRATE = Migrate(APP, DB) |
20 |
| - |
21 |
| -from models import * |
| 25 | +migrate = Migrate(app, db) |
22 | 26 |
|
23 | 27 |
|
24 |
| -@APP.route('/') |
| 28 | +@app.route('/') |
25 | 29 | def view_registered_guests():
|
| 30 | + from models import Guest |
26 | 31 | guests = Guest.query.all()
|
27 | 32 | return render_template('guest_list.html', guests=guests)
|
28 | 33 |
|
29 | 34 |
|
30 |
| -@APP.route('/register', methods = ['GET']) |
| 35 | +@app.route('/register', methods=['GET']) |
31 | 36 | def view_registration_form():
|
32 | 37 | return render_template('guest_registration.html')
|
33 | 38 |
|
34 | 39 |
|
35 |
| -@APP.route('/register', methods = ['POST']) |
| 40 | +@app.route('/register', methods=['POST']) |
36 | 41 | def register_guest():
|
| 42 | + from models import Guest |
37 | 43 | name = request.form.get('name')
|
38 | 44 | email = request.form.get('email')
|
39 |
| - partysize = request.form.get('partysize') |
40 |
| - if not partysize or partysize=='': |
41 |
| - partysize = 1 |
| 45 | + partysize = request.form.get('partysize', 1) |
42 | 46 |
|
43 | 47 | guest = Guest(name, email, partysize)
|
44 |
| - DB.session.add(guest) |
45 |
| - DB.session.commit() |
| 48 | + db.session.add(guest) |
| 49 | + db.session.commit() |
46 | 50 |
|
47 |
| - return render_template('guest_confirmation.html', |
48 |
| - name=name, email=email, partysize=partysize) |
| 51 | + return render_template( |
| 52 | + 'guest_confirmation.html', name=name, email=email, partysize=partysize) |
0 commit comments