From 1b14980dc5cc95058af3198f25d51d25f701c6df Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 6 Sep 2015 17:59:29 -0400
Subject: [PATCH] Add {{root}} to form actions

---
 README.md            |  2 +-
 config.ini.example   | 11 +++++++++--
 requirements.txt     |  4 ++++
 templates/admin.html |  2 +-
 templates/index.html |  2 +-
 templates/login.html |  2 +-
 templates/panel.html |  2 +-
 templates/setup.html |  2 +-
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3bf6aea..0c05758 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ host this on).
 Copy config.ini.example to config.ini and edit it to your liking. Then, you can
 run this command to try the site in development mode:
 
-    python app.py
+    python3 app.py
 
 [Click here](http://localhost:5000) to visit your donation site and further
 instructions will be provided there.
diff --git a/config.ini.example b/config.ini.example
index ada3730..20893d4 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -1,5 +1,8 @@
 [dev]
 # Change this to the actual location of your site
+# You can include a path in the domain if it's a subdirectory
+# i.e. domain=drewdevault.com/donate
+# omit the trailing slash
 protocol=http
 domain=localhost:5000
 # Change this value to something random and secret
@@ -17,13 +20,17 @@ smtp-password=password
 smtp-from=donate@you.com
 
 # Your information
-your_name=Joe Bloe
-your_email=joe@bloe.com
+your-name=Joe Bloe
+your-email=joe@bloe.com
 # ^ you should have a gravatar that works with this email
 
 # SQL connection string
 connection-string=postgresql://postgres@localhost/fosspay
 
+# Stripe API info: https://dashboard.stripe.com/account/apikeys
+stripe-secret=
+stripe-publish=
+
 # Click here first: https://dashboard.stripe.com/account/bitcoin/enable
 enable-bitcoin=no
 
diff --git a/requirements.txt b/requirements.txt
index a38b3e1..d703c30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,9 @@ stripe
 Flask
 Jinja2
 Flask-Misaka
+Flask-Login
+psycopg2
+bcrypt
 gunicorn
 sqlalchemy-utils
+pystache
diff --git a/templates/admin.html b/templates/admin.html
index feb3aff..9d8024c 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -80,7 +80,7 @@
         <div class="col-md-6 well">
             <h4>Add Project</h4>
             <p>Donors will not be given a choice of project unless you have at least 2.</p>
-            <form method="POST" action="create-project">
+            <form method="POST" action="{{root}}/create-project">
                 <div class="form-group">
                     <input class="form-control" type="text" placeholder="Project name" name="name" />
                 </div>
diff --git a/templates/index.html b/templates/index.html
index 0f90ea4..3055b1f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -35,7 +35,7 @@ window.email = "{{user.email}}";
 </noscript>
 <div class="container text-center hidden" id="thanks">
     {% include "post-donation-message.html" %}
-    <form id="new-donor-password" class="hidden" action="password-reset" method="POST">
+    <form id="new-donor-password" class="hidden" action="{{root}}/password-reset" method="POST">
         <p>Set a password now if you want to manage your donations later:</p>
         <input type="password" placeholder="Password" name="password" />
         <input type="hidden" name="token" id="reset-token" />
diff --git a/templates/login.html b/templates/login.html
index 1f603e5..19d496f 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -16,7 +16,7 @@
                 </p>
             </div>
             {% endif %}
-            <form action="login" method="POST">
+            <form action="{{root}}/login" method="POST">
                 <div class="form-group">
                     <input class="form-control" type="text" name="email" placeholder="your@email.com" />
                 </div>
diff --git a/templates/panel.html b/templates/panel.html
index ff9c6ae..fe11a8d 100644
--- a/templates/panel.html
+++ b/templates/panel.html
@@ -25,7 +25,7 @@
         {% for donation in recurring(user) %}
             <tr>
                 <td>
-                    <form method="DELETE" action="cancel/{{ donation.id }}">
+                    <form method="DELETE" action="{{root}}/cancel/{{ donation.id }}">
                         <button type="submit" class="btn btn-danger btn-sm">Cancel</button>
                     </form>
                 </td>
diff --git a/templates/setup.html b/templates/setup.html
index 15d3187..fb969ff 100644
--- a/templates/setup.html
+++ b/templates/setup.html
@@ -59,7 +59,7 @@
 
 <h2>Admin Account</h2>
 <p>Enter your details for the admin account:</p>
-<form class="form" action="setup" method="POST">
+<form class="form" action="{{root}}/setup" method="POST">
     <div class="form-group">
         <input type="text" class="form-control" name="email"
             placeholder="Email" value="{{_cfg("your-email")}}" />