Merge branch 'master' of github.com:ZeusWPI/Foodbot

app/app.py

@@ -24,5 +24,6 @@ class PrefixFix(object):
         environ['PATH_INFO'] = path[len(self.script_name):]
         return self.app(environ, start_response)
 
+
 if not app.debug:
     app.wsgi_app = PrefixFix(app.wsgi_app, '/james')

app/config.example.py

@@ -1,6 +1,5 @@
 # config
 
-
 class Configuration(object):
     SQLALCHEMY_DATABASE_URI = 'sqlite:///james.db'
     DEBUG = True

app/create_database.py

@@ -37,6 +37,7 @@ def chinees_create_entry(zetmeel, vlees="", saus=""):
     entry.configure(chinees, "{} {} {}".format(zetmeel, vlees, saus).rstrip(), 550)
     db.session.add(entry)
 
+
 for zetmeel, vlees, saus in product(zetmelen, vlezen, sauzen):
     chinees_create_entry(zetmeel, vlees, saus)
 

app/forms.py

@@ -35,6 +35,7 @@ class OrderItemForm(Form):
     def populate(self, location):
         self.product_id.choices = [(i.id, (i.name + ": " + euro(i.price))) for i in location.products]
 
+
 class AnonOrderItemForm(OrderItemForm):
     name = StringField('Name', validators=[validators.required()])
 
@@ -43,6 +44,7 @@ class AnonOrderItemForm(OrderItemForm):
         if self.name.data is None:
             self.name.data = session.get('anon_name', None)
 
+
     def validate(self):
         rv = OrderForm.validate(self)
         if not rv:

app/james.py

@@ -1,8 +1,3 @@
-# TEMPORARY ## SHOULD BE DELETED AFTER KELDER.ZEUS HAS THEIR CERTIFICATE
-import os
-os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
-
-
 from views import *
 
 from app import app, db
@@ -15,7 +10,5 @@ from utils import *
 from views import *
 
 
-
-
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=80)

app/login.py

@@ -14,6 +14,7 @@ login_manager.init_app(app)
 def load_user(userid):
     return User.query.filter_by(id=userid).first()
 
+
 @app.route('/login')
 def login():
     return zeus_login()

app/zeus.py

@@ -15,7 +15,7 @@ zeus = oauth.remote_app(
     consumer_key=app.config['ZEUS_KEY'],
     consumer_secret=app.config['ZEUS_SECRET'],
     request_token_params={},
-    base_url='http://kelder.zeus.ugent.be/oauth/api/',
+    base_url='https://kelder.zeus.ugent.be/oauth/api/',
     access_token_method='POST',
     access_token_url='https://kelder.zeus.ugent.be/oauth/oauth2/token/',
     authorize_url='https://kelder.zeus.ugent.be/oauth/oauth2/authorize/'

uwsgi.ini

@@ -1,17 +1,14 @@
 # mysite_uwsgi.ini file
 [uwsgi]
 
-plugins = python
-
 # Django-related settings
 # the base directory (full path)
 chdir           = /home/james/production
-# Django's wsgi file
+# Callables
-module          = app.wsgi
+module          = app
+callable        = app
 # the virtualenv (full path)
-home            = /home/james/production/env
+virtualenv      = /home/james/production/env
-# something about ImportError
-no-site         = true
 
 # process-related settings
 # master