Completed task pcewebpython#1. Added a form for creating new donations, and created a route and handler function inside of 'main.py'.

Author: gapaleo

.gitignore

@@ -1,3 +1,4 @@
 __pycache__/
 .idea/
 my_database.db
+.vscode

main.py

@@ -3,21 +3,33 @@
 
 from flask import Flask, render_template, request, redirect, url_for, session
 
-from model import Donation 
+from model import Donation, Donor
 
 app = Flask(__name__)
 
+
 @app.route('/')
 def home():
     return redirect(url_for('all'))
 
-@app.route('/donations/')
+
+@app.route('/donations')
 def all():
     donations = Donation.select()
     return render_template('donations.jinja2', donations=donations)
-    
+
+
+@app.route('/create', methods=['GET', 'POST'])
+def create():
+    if request.method == 'POST':
+        donor = Donor.select().where(
+            Donor.name == request.form['donor-name']).get()
+        donation = Donation(value=request.form['donation-amount'], donor=donor)
+        donation.save()
+        return redirect(url_for('all'))
+    return render_template('create.jinja2')
+
 
 if __name__ == "__main__":
     port = int(os.environ.get("PORT", 6738))
     app.run(host='0.0.0.0', port=port)
-

model.py

@@ -5,16 +5,16 @@
 
 db = connect(os.environ.get('DATABASE_URL', 'sqlite:///my_database.db'))
 
-class Donor(Model):
-    name = CharField(max_length=255, unique=True)
 
+class BaseModel(Model):
     class Meta:
         database = db
 
-class Donation(Model):
-    value = IntegerField()
-    donor = ForeignKeyField(Donor, backref='donations')
 
-    class Meta:
-        database = db
+class Donor(BaseModel):
+    name = CharField(max_length=255, unique=True)
+
 
+class Donation(BaseModel):
+    value = IntegerField()
+    donor = ForeignKeyField(Donor, backref='donations')

requirements.txt

@@ -2,7 +2,7 @@ click==6.7
 Flask==0.12.3
 itsdangerous==0.24
 Jinja2==2.10
-MarkupSafe==1.0
+MarkupSafe==1.1.1
 peewee==3.2.2
-psycopg2-binary==2.7.4
+psycopg2-binary==2.8.5
 Werkzeug==0.14.1

setup.py

@@ -1,6 +1,6 @@
 import random
 
-from model import db, Donor, Donation 
+from model import db, Donor, Donation
 
 db.connect()
 
@@ -22,5 +22,5 @@
 donors = [alice, bob, charlie]
 
 for x in range(30):
-    Donation(donor=random.choice(donors), value=random.randint(100, 10000)).save()
-
+    Donation(donor=random.choice(donors),
+             value=random.randint(100, 10000)).save()

templates/create.jinja2

@@ -0,0 +1,11 @@
+{% extends 'base.jinja2' %}
+
+{% block subtitle %}Add a donation{% endblock subtitle %}
+
+{% block content %}
+<form method="POST">
+    <label for="donor-name-input">Donor name:</label><input id="donor-name-input" type="text" name="donor-name"><br>
+    <label for="donation-amount-input">Donation amount:</label><input id="donation-amount-input" type="number" name="donation-amount" min="1"><br>
+    <input type="submit" value="Add Donation">
+</form>
+{% endblock content %}