diff --git a/app.py b/app.py index cef74be..2ac0b52 100644 --- a/app.py +++ b/app.py @@ -20,6 +20,7 @@ from flask import Flask, render_template, request, redirect, url_for, session, flash +from flask.blueprints import Blueprint # Optional Security # Uncomment Basic Auth section to enable basic authentication so users will be prompted a username and password before seeing the website. @@ -56,8 +57,9 @@ print("Note: You have not set a device ID. A random one will be set when you login.") +app_blueprint = Blueprint('7eleven', __name__, template_folder='templates', url_prefix=functions.APP_BASE_URL, + static_url_path=functions.APP_BASE_URL or '' + '/static') -app = Flask(__name__) # Uncomment to enable basic authentication #app.config['BASIC_AUTH_FORCE'] = True @@ -65,7 +67,7 @@ #app.config['BASIC_AUTH_PASSWORD'] = 'lockit' #basic_auth = BasicAuth(app) -@app.route('/') +@app_blueprint.route('/') def index(): # If they have pressed the refresh link remove the error and success messages @@ -99,7 +101,7 @@ def index(): -@app.route('/login', methods=['POST', 'GET']) +@app_blueprint.route('/login', methods=['POST', 'GET']) def login(): # Clear the error and success message session.pop('ErrorMessage', None) @@ -144,7 +146,7 @@ def login(): # If there was an error logging in, redirect to the index page with the 7Eleven response if(returnContent['Message']): session['ErrorMessage'] = returnContent['Message'] - return redirect(url_for('index')) + return redirect(url_for('.index')) except: @@ -195,13 +197,13 @@ def login(): with open('./autolock.ini', 'w') as configfile: config.write(configfile) - return redirect(url_for('index')) + return redirect(url_for('.index')) else: # They didn't submit a POST request, so we will redirect to index - return redirect(url_for('index')) + return redirect(url_for('.index')) -@app.route('/logout') +@app_blueprint.route('/logout') def logout(): # The logout payload is an empty string but it is still needed @@ -223,10 +225,10 @@ def logout(): # Clear all of the previously set session variables and then redirect to the index page session.clear() - return redirect(url_for('index')) + return redirect(url_for('.index')) # The confirmation page for a manual lock in -@app.route('/confirm') +@app_blueprint.route('/confirm') def confirm(): # See if we have a temporary lock in price try: @@ -236,11 +238,11 @@ def confirm(): except: # We haven't started locking in yet, show an error and redirect to the index session['ErrorMessage'] = "You haven't started the lock in process yet. Please try again." - return redirect(url_for('index')) + return redirect(url_for('.index')) # Save the auto lock in settings -@app.route('/save_settings', methods=['POST']) +@app_blueprint.route('/save_settings', methods=['POST']) def save_settings(): # If we have sent the form if request.method == 'POST': @@ -254,8 +256,8 @@ def save_settings(): if (float(request.form['max_price']) > 80 and float(request.form['max_price']) < 200): config.set('General', 'max_price', request.form['max_price']) else: - session['ErrorMessage'] = "The price you tried to lock in was either too cheap or too expensive. It should be between 80 cents and 2 dollars" - return redirect(url_for('index')) + session['ErrorMessage'] = "The price you tried to lock in was either too cheap or too expensive. It should be between 100 and 200cents" + return redirect(url_for('.index')) else: config.set('General', 'auto_lock_enabled', "False") @@ -267,12 +269,12 @@ def save_settings(): config.write(configfile) session['SuccessMessage'] = "Settings saved succesfully." - return redirect(url_for('index')) + return redirect(url_for('.index')) -@app.route('/lockin', methods=['POST', 'GET']) +@app_blueprint.route('/lockin', methods=['POST', 'GET']) def lockin(): if request.method == 'POST': # Variable used to search for a manual price @@ -297,7 +299,7 @@ def lockin(): # They tried to do something different from the manual and automatic form, so throw up an error if(submissionMethod != "manual" and submissionMethod != "automatic"): session['ErrorMessage'] = "Invalid form submission. Either use the manual or automatic one on the main page." - return redirect(url_for('index')) + return redirect(url_for('.index')) # If they have manually chosen a postcode/suburb set the price overide to true if(submissionMethod == "manual"): @@ -318,7 +320,7 @@ def lockin(): if not custom_coords: # If it is, get the error message and return back to the index session['ErrorMessage'] = "Error: You entered a manual postcode where no 7-Eleven store is. Please set a Google Maps API key or enter a valid postcode." - return redirect(url_for('index')) + return redirect(url_for('.index')) # Initiate the Google Maps API gmaps = googlemaps.Client(key = API_KEY) # Get the longitude and latitude from the submitted postcode @@ -362,7 +364,7 @@ def lockin(): try: if returnContent['ErrorType'] == 0: session['ErrorMessage'] = "An error has occured. This is most likely due to a fuel lock already being in place." - return redirect(url_for('index')) + return redirect(url_for('.index')) except: pass @@ -381,10 +383,10 @@ def lockin(): if not(priceOveride): if not(float(LockinPrice) <= float(locationResult[1])): session['ErrorMessage'] = "The fuel price is too high compared to the cheapest available. The cheapest we found was at " + locationResult[0] + ". Try locking in there!" - return redirect(url_for('index')) + return redirect(url_for('.index')) if(priceOveride): - return redirect(url_for('confirm')) + return redirect(url_for('.confirm')) # Now we want to lock in the maximum litres we can. NumberOfLitres = int(150) @@ -414,7 +416,7 @@ def lockin(): if(returnContent['Message']): # If it is, get the error message and return back to the index session['ErrorMessage'] = returnContent['Message'] - return redirect(url_for('index')) + return redirect(url_for('.index')) # Otherwise we most likely locked in the price! if(returnContent['Status'] == "0"): # Update the fuel prices that are locked in @@ -426,7 +428,7 @@ def lockin(): # Pop our fueltype and lock in price variables session.pop('fuelType', None) session.pop('LockinPrice', None) - return redirect(url_for('index')) + return redirect(url_for('.index')) # For whatever reason it saved our lock in anyway and return to the index page except: @@ -439,11 +441,17 @@ def lockin(): # Pop our fueltype and lock in price variables session.pop('fuelType', None) session.pop('LockinPrice', None) - return redirect(url_for('index')) + return redirect(url_for('.index')) else: # They just tried to load the lock in page without sending any data session['ErrorMessage'] = "Unknown error occured. Please try again!" - return redirect(url_for('index')) + return redirect(url_for('.index')) + + +app = Flask(__name__, static_url_path=(functions.APP_BASE_URL or '') + '/static') +app.register_blueprint(app_blueprint) +print(app.url_map) + if __name__ == '__main__': # Try and open stores.json diff --git a/functions.py b/functions.py index 6aa8425..ffded44 100644 --- a/functions.py +++ b/functions.py @@ -44,6 +44,9 @@ APP_VERSION = os.getenv('APP_VERSION', settings.APP_VERSION) USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:71.0) Gecko/20100101 Firefox/71.0" +# Base URL for app. e.g. APP_BASE_URL='/7eleven' will put the index page at /7eleven/index instead of /index +APP_BASE_URL = os.getenv('APP_BASE_URL', '').rstrip('/') or None + def getKey(): # Found in file au.com.seveneleven.y.h a = [103, 180, 267, 204, 390, 504, 497, 784, 1035, 520, 1155, 648, 988, 1456, 1785] diff --git a/templates/confirm_price.html b/templates/confirm_price.html index 24525ac..ab90221 100644 --- a/templates/confirm_price.html +++ b/templates/confirm_price.html @@ -1,7 +1,7 @@ {% extends "index.html" %} {% block content %}
-
+




diff --git a/templates/index.html b/templates/index.html index b681b06..460f3f4 100644 --- a/templates/index.html +++ b/templates/index.html @@ -14,7 +14,7 @@ - + @@ -103,7 +103,7 @@

7Eleven Fuel Locker

{% if session['accountID'] %}
- +

Welcome, {{ session['firstName'] }}.

@@ -134,11 +134,11 @@

You purchased up to 150 litres at

{% else %}
- +

Please enter your email and password below:

- +





@@ -166,7 +166,7 @@

Refresh

{% if session['accountID'] %}
- + LOGOUT
diff --git a/templates/price.html b/templates/price.html index 6cf741d..fd3b63a 100644 --- a/templates/price.html +++ b/templates/price.html @@ -4,7 +4,7 @@
Settings | Credits
- +
These settings are for the automatic fuel lock function. Proceed with caution, you will not be warned when a fuel lock is found.


@@ -31,7 +31,7 @@
These settings are for the a {% else %}
Automatic | Manual | Settings | Credits
- +