From f3b16b929e6f2eb91579a90a76b5c6dfac874017 Mon Sep 17 00:00:00 2001 From: Max Value Date: Wed, 5 Mar 2025 03:07:52 +0000 Subject: [PATCH] WSGI functional + added all admin panels ~ fixed main gfx page to work with new system ~ schema is now vital to database sanity check ~ moved generate_docs.py to root for merge - removed all PHP - removed database from git still to-do: + add 3 more discounts + more different fonts ~ make price and discount louder ~ balnce GFX ~ color testing ~ stress test with set design team ~ fix ebook system (low) --- .gitignore | 1 + auth/clock.php | 143 ---- auth/index.php | 503 ------------ autocue/index.html | 123 --- auth/generate_docs.py => generate_docs.py | 52 -- requirements.txt | 3 + schema | 13 +- teleshopping.py | 139 +++- templates/admin.html | 20 + templates/clock.html | 99 +++ templates/docs.html | 12 + templates/gfx.html | 920 +++++++++++----------- templates/price.html | 112 +++ templates/text.html | 83 ++ templates/timer.html | 87 ++ 15 files changed, 1017 insertions(+), 1293 deletions(-) delete mode 100644 auth/clock.php delete mode 100644 auth/index.php delete mode 100644 autocue/index.html rename auth/generate_docs.py => generate_docs.py (72%) create mode 100644 requirements.txt create mode 100644 templates/admin.html create mode 100644 templates/clock.html create mode 100644 templates/docs.html create mode 100644 templates/price.html create mode 100644 templates/text.html create mode 100644 templates/timer.html diff --git a/.gitignore b/.gitignore index 2b4f1d7..e3e7c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.wsgi +data.db diff --git a/auth/clock.php b/auth/clock.php deleted file mode 100644 index f1e9b9d..0000000 --- a/auth/clock.php +++ /dev/null @@ -1,143 +0,0 @@ - - - - - XMDV - - - - - - diff --git a/auth/index.php b/auth/index.php deleted file mode 100644 index 2889073..0000000 --- a/auth/index.php +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - -

-

-

-

XMDV Interface

-

-

- XMDV Shopping is created by William Greenwood
- GFX Overlay - Autocue - Source repository -

-

-

- Products -

-"; - echo " $subtext
"; -} -$checkedExtra = ""; -if ($data['showingExtra'] == "true") { - $checkedExtra = " checked='checked' "; -} -$checkedMain = ""; -if ($data['showingMain'] == "true") { - $checkedMain = " checked='checked' "; -} -$checkedAll = ""; -if ($data['showingAll'] == "true") { - $checkedAll = " checked='checked' "; -} -?> -

- > - Showing all components
- > - Showing product information
- > - Showing extra information -

-

- -

- Pricing -

- - - - > - - Prefix
- - > - - Postfix

- - '> - Unsold (%) - -

- - '> - Price of origional (%)
- - '> - Discount change (%/s)
- - > - Round prices -

-

- -

- Top text -"; - echo " $line

"; -} -echo ""; -echo "

Bottom text"; -for ($i = 0; $i < count($text['bottomText']); $i++) { - $line = $text['bottomText'][$i]; - $checked = ""; - if (in_array($line, $data['bottomText'])) { - $checked = " checked='checked' "; - } - echo "

"; - echo " $line

"; -} -echo "

"; - -echo "

Notes"; -echo ""; -echo "

"; - -echo "

-Doomsday clock (Incr. $clockIncrement deg)"; -echo "

"; -echo ""; -for ($i = 0; $i < 360; $i += $clockIncrement) { - $checked = ""; - if ($clock['currentPosition'] == $i) { - $checked = " checked='checked' style='outline: 2px solid red;'"; - } - echo ""; -} -?> -

-

- Movement - '> - Movement speed (ms/tick)
-

- - Ease function -

- - Linear function -

-

-

-

- -
- - -
-

-

Current data

-" . var_export($data, true) . "" ?> -" . var_export($clock, true) . "" ?> -

-

-

- - diff --git a/autocue/index.html b/autocue/index.html deleted file mode 100644 index 51b0c8f..0000000 --- a/autocue/index.html +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - -

some test text!

-

Producer Notes!

-

- T1: - - T2: - - T3: - Left: / -

-

-

-

- - diff --git a/auth/generate_docs.py b/generate_docs.py similarity index 72% rename from auth/generate_docs.py rename to generate_docs.py index e7010e3..35ff0fe 100755 --- a/auth/generate_docs.py +++ b/generate_docs.py @@ -160,55 +160,3 @@ os.system(""" zip -Xur9D ../docs/item_manifest.epub ../docs/epub/* && ebook-convert ../docs/item_manifest.epub ../docs/item_manifest.mobi """) - -os.system(f"pandoc -f html ../docs/epub/info_page.html -t latex -o ../docs/pdf/info.tex") -for i in range(len(items)): - os.system(f"pandoc -f html ../docs/epub/item{i}.html -t latex -o ../docs/pdf/item{i}.tex") - -geometry_options = { - "tmargin": "3cm", - "bmargin": "2cm", - "lmargin": "1.5cm", - "rmargin": "1.5cm" - } -doc = Document( - "XMDV Teleshopping item manifest", geometry_options=geometry_options, - textcomp = True - ) -doc.preamble.append(NoEscape(r"\usepackage{longtable}")) -doc.preamble.append(NoEscape(r"\usepackage{booktabs}")) -doc.preamble.append(NoEscape(r"\usepackage{hyperref}")) -doc.preamble.append(NoEscape(r"\usepackage{xcolor}")) - -doc.preamble.append(NoEscape(r"\def\tightlist{}")) - -doc.preamble.append(Command("title", "XMDV Teleshopping item manifest")) -doc.preamble.append(Command("author", "William Greenwood")) -doc.preamble.append(Command("date", NoEscape(r"\today"))) - -doc.append(NoEscape(r""" -\maketitle -\begin{center} -\textcolor{red}{\large{}Contains HIDDEN INFORMATION. NOT to be shared with anchor before shoot.} -\end{center} -\tableofcontents -\newpage - """)) - -with open(f"../docs/pdf/info.tex", "r") as f: - doc.append(NoEscape(f.read().encode('latin-1', 'ignore').decode('utf-8'))) - -doc.append(NoEscape(r""" - \vspace*{\fill} - \section{Items} - \newpage - """)) - -for i in range(len(items)): - with open(f"../docs/pdf/item{i}.tex", "r") as f: - doc.append(NoEscape(f.read().encode('latin-1', 'ignore').decode('utf-8'))) - - doc.append(NoEscape(r"\newpage")) - -doc.generate_tex("../docs/pdf/item_manifest") -doc.generate_pdf("../docs/item_manifest", silent=False) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..09e14b6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +flask_httpauth +flask +werkzeug diff --git a/schema b/schema index 4ce7e55..24fac1c 100644 --- a/schema +++ b/schema @@ -1,7 +1,10 @@ CREATE TABLE state ( id INTEGER PRIMARY KEY, item_id INTEGER, - discount REAL, + discount_1 REAL, + discount_2 REAL, + discount_3 REAL, + discount_4 REAL, discount_change INTEGER, percent_remaining INTEGER, currency_symbol TEXT, @@ -37,10 +40,14 @@ CREATE TABLE state ( movement_function TEXT, note TEXT ); + INSERT INTO state ( id, item_id, - discount, + discount_1, + discount_2, + discount_3, + discount_4, discount_change, percent_remaining, currency_symbol, @@ -74,4 +81,4 @@ INSERT INTO state ( current_position, movement_speed, movement_function, - note) VALUES (1, 0, 0.0, 50, 100, 'Â£', 0, '[0,1]', 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 0, 0, 40, 'linear', 'test note'); + note) VALUES (1, 0, 0.0, 0.0, 0.0, 0.0, 50, 100, 'Â£', 0, '[0,1]', 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 0, 0, 40, 'linear', 'test note'); diff --git a/teleshopping.py b/teleshopping.py index e234dc8..686e1fb 100755 --- a/teleshopping.py +++ b/teleshopping.py @@ -1,13 +1,40 @@ #!.venv/bin/python +from werkzeug.security import generate_password_hash, check_password_hash from flask import Flask, Response, request, render_template, jsonify +from flask_httpauth import HTTPBasicAuth +from datetime import datetime, timezone +from math import radians, cos, sin +from ast import literal_eval from os import path import sqlite3 import json -from ast import literal_eval + +INCREMENT = 18 app = Flask(__name__) +auth = HTTPBasicAuth() + +# get the secrets ready +with open(path.join(app.root_path, "..", "secrets.json"), "r") as f: + users = json.loads(f.read()) +users = {k: generate_password_hash(v) for (k, v) in users.items()} + +# get the static data ready +with open(path.join(app.root_path, "static", "static.json"), "r") as f: + static_data = json.loads(f.read()) + + + +# make the password verifier function +@auth.verify_password +def verify_password(username, password): + if username in users and \ + check_password_hash(users.get(username), password): + return username + +# database helper function def database(field: str | list): query = f"SELECT {','.join(field) if type(field) == list else field} FROM state WHERE id=1;" @@ -19,28 +46,100 @@ def database(field: str | list): return dict(zip(column_names, result)) # combine column names with data into dict + + + @app.route("/") def gfx_main(): return Response(render_template("gfx.html"), mimetype="text/html") @app.route("/") def gfx_page(page): - if page in ["autocue", "docs"]: + if page in ["autocue"]: return Response(render_template(f"{page}.html"), mimetype="text/html") else: return "", 404 + + + @app.route("/admin") +@auth.login_required def admin_main(): - ... + return Response(render_template("admin.html", mimetype="text/html")) -@app.route("/admin/") +@app.route("/admin/", methods=['GET', 'POST']) +@auth.login_required def admin_page(page): - ... + if page in ["text", "clock", "timer", "price"]: + if request.method == "POST": # if posting with data update the database then return the new admin page + + post_data = request.form.to_dict() + aggrigate_data = {} + + # perform all data clean up for special cases + aggrigate_data = {} + for key in post_data: + # if a key begins with the word "aggrigate": aggrigate it with all other keys with the same body into a list + if key[:9] == "aggrigate": + new_key = key[10:-5] + if new_key in aggrigate_data: + aggrigate_data[new_key].append(int(post_data[key])) + else: + aggrigate_data.update({new_key: [int(post_data[key])]}) + + # if the key is a timer, make the time fixed to the epoch instead of relative (& account for offset) + if key[:3] == "end": + aggrigate_data.update( + {key: int(datetime.now(timezone.utc).timestamp()) + int(post_data[key])} + ) + + else: aggrigate_data.update({key: post_data[key]}) + + with sqlite3.connect(path.join(app.root_path, "data.db")) as connection: + cursor = connection.cursor() + result = cursor.execute("SELECT * FROM pragma_table_info('state');").fetchall()[1:] + + types = {"TEXT":str, "INTEGER":int, "REAL":float} + type_note = {c[1]:types[c[2]] for c in result} + + valid_data = {k: type_note[k].__call__(aggrigate_data[k]) for k in aggrigate_data if k in type_note} + + query = f""" + UPDATE state SET + {', '.join([f'{k} = \'{v}\'' if type(v) == str else f'{k} = {v}' for (k,v) in valid_data.items()])} + WHERE id = 1; + """ + + cursor.execute(query) + connection.commit() + + request.method = "internal" # set method to internal so that the api call returns only the python object + if page == "clock": + coords = [{ + "i":i, + "x":45*cos(radians(i-90))+50, + "y":45*sin(radians(i-90))+50 + } for i in list(range(0, 360, INCREMENT))] + return Response(render_template("clock.html", data=api(), positions=coords), mimetype="text/html") + + if page == "text": + return Response(render_template("text.html", data=api(), text=static_data['text']), mimetype="text/html") + + if page == "timer": + return Response(render_template("timer.html", data=api()), mimetype="text/html") + + if page == "price": + return Response(render_template("price.html", data=api(), items=static_data['items']), mimetype="text/html") + else: + return "", 404 + + + @app.route("/api") def api(): - if request.method == "GET": + if request.method in ["GET", "internal"]: data = database("*") focus_extra = {} @@ -52,17 +151,15 @@ def api(): focus_extra[f"bool_{key[6:]}"] = bool(value) # if 1,2 then True, if 0 then False data |= focus_extra + if request.method == "internal": return data return jsonify(data) - - elif request.method == "POST": - ... else: return "", 404 @app.route("/api/items") def api_items(): if request.method == "GET": - return app.send_static_file("static.json") + return jsonify(static_data) else: return "", 404 @@ -76,5 +173,25 @@ def api_clock(): else: return "", 404 + + + if __name__ == "__main__": - app.run(host='127.0.0.1', port=5000, debug=True) + # sanity check on the db + with open(path.join(app.root_path, "schema"), "r") as f: + schema, load = f.read().split("\n\n") + with sqlite3.connect(path.join(app.root_path, "data.db")) as connection: + cursor = connection.cursor() + try: + cursor.execute(load) + except sqlite3.IntegrityError: + print("Database is setup correctly") + pass + except sqlite3.OperationalError: + print("Table missing or corrupt...") + cursor.execute("DROP TABLE state;") + cursor.execute(schema) + cursor.execute(load) + connection.commit() + + app.run(host='192.168.8.143', port=5080, debug=True) diff --git a/templates/admin.html b/templates/admin.html new file mode 100644 index 0000000..fece3cf --- /dev/null +++ b/templates/admin.html @@ -0,0 +1,20 @@ + + + + + XMDV + + +

Hello!

+

Get ready!

+

+ Control pannels +

+

+ + diff --git a/templates/clock.html b/templates/clock.html new file mode 100644 index 0000000..aba0241 --- /dev/null +++ b/templates/clock.html @@ -0,0 +1,99 @@ + + + + + XMDV + + + + + + diff --git a/templates/docs.html b/templates/docs.html new file mode 100644 index 0000000..4af7662 --- /dev/null +++ b/templates/docs.html @@ -0,0 +1,12 @@ + + + + + + + +

+

+ + + diff --git a/templates/gfx.html b/templates/gfx.html index 231551d..a80f848 100644 --- a/templates/gfx.html +++ b/templates/gfx.html @@ -1,320 +1,324 @@ - + + + XMDV - + @@ -404,24 +408,24 @@ circle { - - + + -- 2.39.2