Merge branch 'master' of https://github.com/MaanuelMM/RestaurantProto…

…typeCDI

loaders/data_loader.py

@@ -2,15 +2,18 @@
 # -*- coding: utf-8 -*-
 # Authors:      Luis Carles Durá, Jaime García Velázquez, Manuel Martín Malagón, Rafael Rodríguez Sánchez
 # Created:      2019/04/11
-# Last update:  2019/04/16
+# Last update:  2019/04/22
 
 
 import json
+import os
+
 
 class DataLoader:
 
     def __init__(self):
         try:
+            self.PORT = os.environ.get('PORT', '5000')
             with open('data/products.json', encoding='utf-8') as data:
                 self.products = json.load(data)
             with open('data/product_categories.json', encoding='utf-8') as data:
@@ -25,4 +28,4 @@ def __init__(self):
                 self.order_states = json.load(data)
         except:
             print("Error while reading web application data.")
-            raise
+            raise

requirements.txt

@@ -1 +1,2 @@
-Flask==1.0.2
+Flask==1.0.2
+flask-sslify==0.1.5

web.py

@@ -11,6 +11,8 @@
 
 from flask import Flask, flash, redirect, render_template, request, session, abort, send_from_directory
 from loaders.data_loader import DataLoader
+from flask_sslify import SSLify
+
 
 try:
     data = DataLoader()
@@ -19,6 +21,9 @@
 
 app = Flask(__name__)
 
+if 'DYNO' in os.environ:  # only trigger SSLify if the app is running on Heroku
+    sslify = SSLify(app)
+
 
 def order_has_pending_record(order_id):
     has_pending_record = False
@@ -496,4 +501,4 @@ def customer_order_summary(num_table, num_order):
 
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", debug=True)
+    app.run(host="0.0.0.0", port=int(data.PORT))