From 6ee6fb2cb1367b799ec004ecad6eb3c56465ccb2 Mon Sep 17 00:00:00 2001 From: Max Value Date: Wed, 26 Feb 2025 11:49:03 +0000 Subject: [PATCH] Rewrite read-only + API is build for read only with database included + autocue and GFX main are largely complete but should be tested - removed old index and autocue --- .gitignore | 14 +- clock.json | 1 - data.db | Bin 0 -> 16384 bytes data.json | 1 - index.html | 783 ------------------ items.json | 32 - note | 2 - schema | 77 ++ sigil.json | 56 -- {assets => static/assets}/arrow.svg | 0 {assets => static/assets}/clock.svg | 0 {assets => static/assets}/star.svg | 0 static/fonts.css | 32 + {fonts => static/fonts}/Archivo-Bold.woff | Bin .../fonts}/Archivo-BoldItalic.woff | Bin {fonts => static/fonts}/Archivo-Italic.woff | Bin {fonts => static/fonts}/Archivo-Regular.woff | Bin {fonts => static/fonts}/Archivo-SemiBold.woff | Bin .../fonts}/Archivo-SemiBoldItalic.woff | Bin static/static.json | 115 +++ teleshopping.py | 80 ++ templates/autocue.html | 128 +++ templates/gfx.html | 722 ++++++++++++++++ text.json | 28 - 24 files changed, 1155 insertions(+), 916 deletions(-) delete mode 100755 clock.json create mode 100644 data.db delete mode 100755 data.json delete mode 100644 index.html delete mode 100755 items.json delete mode 100644 note create mode 100644 schema delete mode 100755 sigil.json rename {assets => static/assets}/arrow.svg (100%) rename {assets => static/assets}/clock.svg (100%) rename {assets => static/assets}/star.svg (100%) create mode 100644 static/fonts.css rename {fonts => static/fonts}/Archivo-Bold.woff (100%) rename {fonts => static/fonts}/Archivo-BoldItalic.woff (100%) rename {fonts => static/fonts}/Archivo-Italic.woff (100%) rename {fonts => static/fonts}/Archivo-Regular.woff (100%) rename {fonts => static/fonts}/Archivo-SemiBold.woff (100%) rename {fonts => static/fonts}/Archivo-SemiBoldItalic.woff (100%) create mode 100755 static/static.json create mode 100755 teleshopping.py create mode 100644 templates/autocue.html create mode 100644 templates/gfx.html delete mode 100755 text.json diff --git a/.gitignore b/.gitignore index 8a9cde9..2b4f1d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -*.ttf -.venv/ -item[0-9].html -content.opf -toc.ncx -*.toc -*.epub -*.mobi -*.tex -*.pdf -*.aux -*.log -*.out +*.wsgi diff --git a/clock.json b/clock.json deleted file mode 100755 index c95e641..0000000 --- a/clock.json +++ /dev/null @@ -1 +0,0 @@ -{"currentPosition":0,"movementSpeed":30,"function":"ease","lightingCues":["false","false","true","false","false","true","false","true","false","true"]} \ No newline at end of file diff --git a/data.db b/data.db new file mode 100644 index 0000000000000000000000000000000000000000..6a238932386de91e52b822484e07fcf712f6fad3 GIT binary patch literal 16384 zcmeI&Pixdb7zXfU72K9CDjpW;!8u8VBDU3@T}zPSD!N9nhz$8NSqGAtWiqiX-g@ZG zPvNKV>Zj__Np`n+T|#d{DbKLkWS_}o-uyOuNZ5}b#?lIwX;Va&?Rob+-}hcJ=6T+x zTW&9wo?AayY`ay{{N=_K>rL`_;xfo zVsC<@ZP#H%!P{P!q_RwOr7Uv?8k5gF`4*|ESRTjq%!EmVvfPLwl1i#6=}RhOgi20% zd0NCeXJPO;bVCvo9p}Put7lxQRGg3@xhyST?htEhb+H^4M@qR-t0Q8qb3QX7lk_-E zYTPNL|CZF`QJ#}27YER3mDtr-oLCdBhVw#J(^5`l&Ud=w-R^j=JAS?ztEz~FA*oO) zx3X{?biy{J^R+3Ru1)D|ZTg~fwtbRjI;qNzDripYpgFCC=Cl@?(`sl=>zRA#EGq^5 z9_JUKdsJ`oH|Q+*1F~9}NN! YfB*y_009U<00Izz00bZafg2|97j0)U=l}o! literal 0 HcmV?d00001 diff --git a/data.json b/data.json deleted file mode 100755 index bb6977a..0000000 --- a/data.json +++ /dev/null @@ -1 +0,0 @@ -{"topText":["It's here!"],"bottomText":["Something bright and radiant for all of you at home!","I take your life and raise you 10 over the hour!","We grab the bullion counterweight and throw ourselves down!","We have been falling for a looong time people!","Let me slip into something less spacious!","Down the side of a large golden pyramid!","So we dress ourselves in your Ballast!","I used to be so unimaginably tall!"],"bannerText":"Discounts on XMDV!","itemId":1,"currency":{"prefix":"$","postfix":" hairs"},"discount":-5000,"percentLeft":20,"prefix":"false","round":"true","priceChange":50,"showingMain":"true","showingAll":"true","showingExtra":"true","showingTimer1":"true","showingTimer2":"false","showingTimer3":"false","timer3Main":"false","showingBanner":"true","showingSigil":["false","false","false","false"],"timer1End":1724849889,"timer2End":1724848450,"timer3End":1724787297,"timerOffset":0} \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index 497a0c5..0000000 --- a/index.html +++ /dev/null @@ -1,783 +0,0 @@ - - - - - - - - - - -
-
-

Code

-

Raiting

-

Subtext

-

Description

-
-

Origional Price

-
- -

Percent off

-
-
-
-

Current Price

-

Monthly Price

-
-

In stock: Sold:

-

-
-
-
- -
-

-
-

Welcome to XMDV Shopping!

-
-
-

-
-
- - -
-
- -
- - - - - - - -
-
- - - - - - -
-
- - - - - - -
-
- - - - - - -
- - diff --git a/items.json b/items.json deleted file mode 100755 index 4f2aeb9..0000000 --- a/items.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "code":"Placeholder item code", - "rating":"★★★★★", - "subtext":"Test item name", - "description":"Test item description", - "origionalPrice":0, - "stockCount":0, - "notes":"

[autocue] Showing: test product.
Commencing shortly.

", - "crew_notes":"testing" - }, - { - "code":"Item 1", - "rating":"✶✶✶✶✶", - "subtext":"Gold Stick-Strip™", - "description":"50m shiny gold Stick-Strip™! Origional beautiful formula! Cannot be broken! Too beautiful! Stuck!", - "origionalPrice":500, - "stockCount":100, - "notes":"

ITEM IS A REEL OF GOLDEN TAPE THAT CANNOT BE TORN

  • EMPASIZE AS MUCH AS POSSIBLE HOW BEAUTIFUL IT IS
", - "crew_notes":"testing" - }, - { - "code":"Item 2", - "rating":"✦✦✦", - "subtext":"Item subtext", - "description":"Product 2 description. It's really long to see if the badge element moves down the page at all. I f**king hate CSS positioning. Oops family show.", - "origionalPrice":170, - "stockCount":200, - "notes":"Some more notes...", - "crew_notes":"testing" - } -] diff --git a/note b/note deleted file mode 100644 index 5c85231..0000000 --- a/note +++ /dev/null @@ -1,2 +0,0 @@ -5 cat lookin' things -T3 (unshown) corresponds to a doomsday strike \ No newline at end of file diff --git a/schema b/schema new file mode 100644 index 0000000..4ce7e55 --- /dev/null +++ b/schema @@ -0,0 +1,77 @@ +CREATE TABLE state ( + id INTEGER PRIMARY KEY, + item_id INTEGER, + discount REAL, + discount_change INTEGER, + percent_remaining INTEGER, + currency_symbol TEXT, + crawler_top_index INTEGER, + list_crawler_bottom TEXT, + banner_index INTEGER, + bool_prefix INTEGER, + bool_rounding INTEGER, + bool_all INTEGER, + bool_product INTEGER, + bool_extra INTEGER, + bool_banner INTEGER, + bool_sigil_1 INTEGER, + bool_sigil_2 INTEGER, + bool_sigil_3 INTEGER, + bool_sigil_4 INTEGER, + bool_number INTEGER, + end_timer_1 INTEGER, + end_timer_2 INTEGER, + end_timer_3 INTEGER, + end_timer_4 INTEGER, + end_timer_5 INTEGER, + end_timer_6 INTEGER, + focus_timer_1 INTEGER, + focus_timer_2 INTEGER, + focus_timer_3 INTEGER, + focus_timer_4 INTEGER, + focus_timer_5 INTEGER, + focus_timer_6 INTEGER, + timer_offset INTEGER, + current_position INTEGER, + movement_speed INTEGER, + movement_function TEXT, + note TEXT +); +INSERT INTO state ( + id, + item_id, + discount, + discount_change, + percent_remaining, + currency_symbol, + crawler_top_index, + list_crawler_bottom, + banner_index, + bool_prefix, + bool_rounding, + bool_all, + bool_product, + bool_extra, + bool_banner, + bool_sigil_1, + bool_sigil_2, + bool_sigil_3, + bool_sigil_4, + bool_number, + end_timer_1, + end_timer_2, + end_timer_3, + end_timer_4, + end_timer_5, + end_timer_6, + focus_timer_1, + focus_timer_2, + focus_timer_3, + focus_timer_4, + focus_timer_5, + focus_timer_6, + timer_offset, + 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'); diff --git a/sigil.json b/sigil.json deleted file mode 100755 index 4eb374c..0000000 --- a/sigil.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "square":[ - "110,10", - "90,110", - "50,10", - "70,110", - "30,110", - "10,10", - "10,30", - "90,30", - "70,90", - "50,90", - "30,30", - "110,90", - "110,70", - "30,50", - "70,50", - "50,50", - "90,70", - "10,70", - "10,50", - "30,70", - "70,70", - "50,70", - "90,50", - "110,50", - "10,90", - "90,90", - "50,30", - "70,30", - "30,90", - "110,30", - "110,110", - "30,10", - "50,110", - "70,10", - "90,10", - "10,110" - ], - "phrases":[ - "anchor", - "thebeast", - "buyitall", - "consumer", - "runners", - "xmdv", - "broadcast", - "bleedout", - "quant", - "bullion", - "adarksun", - "dollar", - "beast" - ] - -} diff --git a/assets/arrow.svg b/static/assets/arrow.svg similarity index 100% rename from assets/arrow.svg rename to static/assets/arrow.svg diff --git a/assets/clock.svg b/static/assets/clock.svg similarity index 100% rename from assets/clock.svg rename to static/assets/clock.svg diff --git a/assets/star.svg b/static/assets/star.svg similarity index 100% rename from assets/star.svg rename to static/assets/star.svg diff --git a/static/fonts.css b/static/fonts.css new file mode 100644 index 0000000..08eb412 --- /dev/null +++ b/static/fonts.css @@ -0,0 +1,32 @@ +@font-face { + font-family: "Archivo"; + font-weight: normal; + font-style: normal; + src: + local("Archivo"), + url("fonts/Archivo-Regular.woff") format("woff"), +} +@font-face { + font-family: "Archivo"; + font-weight: bold; + font-style: normal; + src: + local("Archivo"), + url("fonts/Archivo-SemiBold.woff") format("woff"), +} +@font-face { + font-family: "Archivo"; + font-weight: normal; + font-style: italic; + src: + local("Archivo"), + url("fonts/Archivo-Italic.woff") format("woff"), +} +@font-face { + font-family: "Archivo"; + font-weight: bold; + font-style: italic; + src: + local("Archivo"), + url("fonts/Archivo-SemiBoldItalic.woff") format("woff"), +} diff --git a/fonts/Archivo-Bold.woff b/static/fonts/Archivo-Bold.woff similarity index 100% rename from fonts/Archivo-Bold.woff rename to static/fonts/Archivo-Bold.woff diff --git a/fonts/Archivo-BoldItalic.woff b/static/fonts/Archivo-BoldItalic.woff similarity index 100% rename from fonts/Archivo-BoldItalic.woff rename to static/fonts/Archivo-BoldItalic.woff diff --git a/fonts/Archivo-Italic.woff b/static/fonts/Archivo-Italic.woff similarity index 100% rename from fonts/Archivo-Italic.woff rename to static/fonts/Archivo-Italic.woff diff --git a/fonts/Archivo-Regular.woff b/static/fonts/Archivo-Regular.woff similarity index 100% rename from fonts/Archivo-Regular.woff rename to static/fonts/Archivo-Regular.woff diff --git a/fonts/Archivo-SemiBold.woff b/static/fonts/Archivo-SemiBold.woff similarity index 100% rename from fonts/Archivo-SemiBold.woff rename to static/fonts/Archivo-SemiBold.woff diff --git a/fonts/Archivo-SemiBoldItalic.woff b/static/fonts/Archivo-SemiBoldItalic.woff similarity index 100% rename from fonts/Archivo-SemiBoldItalic.woff rename to static/fonts/Archivo-SemiBoldItalic.woff diff --git a/static/static.json b/static/static.json new file mode 100755 index 0000000..3e83cca --- /dev/null +++ b/static/static.json @@ -0,0 +1,115 @@ +{ + "text": { + "crawler_top":[ + "Test top text 1", + "Test top text 2", + "It's here!" + ], + "crawler_bottom":[ + "Something bright and radiant for all of you at home!", + "I take your life and raise you 10 over the hour!", + "We grab the bullion counterweight and throw ourselves down!", + "We have been falling for a looong time people!", + "Let me slip into something less spacious!", + "Down the side of a large golden pyramid!", + "So we dress ourselves in your Ballast!", + "I used to be so unimaginably tall!", + "It's here!" + ], + "banner":[ + "Buy XMDV!", + "Discounts on XMDV!", + "Imagine thinking on a piece of paper!", + "Imagine thinking on a dime!", + "Imagine thinking on a dollar!", + "The quant we created!", + "The quant we fear!", + "It's here!" + ], + "sigil":[ + "anchor", + "thebeast", + "buyitall", + "consumer", + "runners", + "xmdv", + "broadcast", + "bleedout", + "quant", + "bullion", + "adarksun", + "dollar", + "beast" + ], + "square":[ + "110,10", + "90,110", + "50,10", + "70,110", + "30,110", + "10,10", + "10,30", + "90,30", + "70,90", + "50,90", + "30,30", + "110,90", + "110,70", + "30,50", + "70,50", + "50,50", + "90,70", + "10,70", + "10,50", + "30,70", + "70,70", + "50,70", + "90,50", + "110,50", + "10,90", + "90,90", + "50,30", + "70,30", + "30,90", + "110,30", + "110,110", + "30,10", + "50,110", + "70,10", + "90,10", + "10,110" + ] + }, + "items": [ + { + "code":"Placeholder item code", + "rating":"★★★★★", + "subtext":"Test item name", + "description":"Test item description", + "origional_price":0, + "stock_count":0, + "notes":"

[autocue] Showing: test product.
Commencing shortly.

", + "crew_notes":"testing" + }, + { + "code":"Item 1", + "rating":"✶✶✶✶✶", + "subtext":"Gold Stick-Strip™", + "description":"50m shiny gold Stick-Strip™! Origional beautiful formula! Cannot be broken! Too beautiful! Stuck!", + "origional_price":500, + "stock_count":100, + "notes":"

ITEM IS A REEL OF GOLDEN TAPE THAT CANNOT BE TORN

  • EMPASIZE AS MUCH AS POSSIBLE HOW BEAUTIFUL IT IS
", + "crew_notes":"testing" + }, + { + "code":"Item 2", + "rating":"✦✦✦", + "subtext":"Item subtext", + "description":"Product 2 description. It's really long to see if the badge element moves down the page at all. I f**king hate CSS positioning. Oops family show.", + "origional_price":170, + "stock_count":200, + "notes":"Some more notes...", + "crew_notes":"testing" + } + ] +} diff --git a/teleshopping.py b/teleshopping.py new file mode 100755 index 0000000..e234dc8 --- /dev/null +++ b/teleshopping.py @@ -0,0 +1,80 @@ +#!.venv/bin/python + +from flask import Flask, Response, request, render_template, jsonify +from os import path +import sqlite3 +import json +from ast import literal_eval + +app = Flask(__name__) + +def database(field: str | list): + query = f"SELECT {','.join(field) if type(field) == list else field} FROM state WHERE id=1;" + + with sqlite3.connect(path.join(app.root_path, "data.db")) as connection: + cursor = connection.cursor() + result = cursor.execute(query).fetchone() + + column_names = [description[0] for description in cursor.description] + + 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"]: + return Response(render_template(f"{page}.html"), mimetype="text/html") + else: + return "", 404 + +@app.route("/admin") +def admin_main(): + ... + +@app.route("/admin/") +def admin_page(page): + ... + +@app.route("/api") +def api(): + if request.method == "GET": + data = database("*") + + focus_extra = {} + for key, value in data.items(): + if key[:4] == "bool": data[key] = bool(value) # if the key starts with "bool" make the data a bool + elif key[:4] == "list": data[key] = literal_eval(value) # if the key starts with "list" make the data a literal list + elif key[:5] == "focus": # if the key starts with "focus" make the data into a bool with an additional dict entry for "showing" bool + data[key] = bool((value-1)+abs(value-1)) # if 2 then True, if 1,0 then False + focus_extra[f"bool_{key[6:]}"] = bool(value) # if 1,2 then True, if 0 then False + data |= focus_extra + + 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") + + else: + return "", 404 + +@app.route("/api/clock") +def api_clock(): + if request.method == "GET": + keys = ["current_position", "movement_speed", "movement_function"] + return jsonify(database(keys)) + + else: + return "", 404 + +if __name__ == "__main__": + app.run(host='127.0.0.1', port=5000, debug=True) diff --git a/templates/autocue.html b/templates/autocue.html new file mode 100644 index 0000000..4c94ad9 --- /dev/null +++ b/templates/autocue.html @@ -0,0 +1,128 @@ + + + + + XMDV + + + + + +
some test text!
+
Producer Notes!
+
+ T1: - + T2: - + T3:
+ T4: - + T5: - + T6: + Left: / +
+
+ +
+ + diff --git a/templates/gfx.html b/templates/gfx.html new file mode 100644 index 0000000..231551d --- /dev/null +++ b/templates/gfx.html @@ -0,0 +1,722 @@ + + + + + + + + + + +
+
+

Code

+

Raiting

+

Subtext

+

Description

+
+

Origional Price

+
+ +

Percent off

+
+
+
+

Current Price

+

Monthly Price

+
+

In stock: Sold:

+

+
+
+
+ +
+

+
+

Welcome to XMDV Shopping!

+
+
+

+
+
+ + +
+
+ +
+ + + + + + + +
+
+ + + + + + +
+
+ + + + + + +
+
+ + + + + + +
+ + + + diff --git a/text.json b/text.json deleted file mode 100755 index eeadc99..0000000 --- a/text.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "topText":[ - "Test top text 1", - "Test top text 2", - "It's here!" - ], - "bottomText":[ - "Something bright and radiant for all of you at home!", - "I take your life and raise you 10 over the hour!", - "We grab the bullion counterweight and throw ourselves down!", - "We have been falling for a looong time people!", - "Let me slip into something less spacious!", - "Down the side of a large golden pyramid!", - "So we dress ourselves in your Ballast!", - "I used to be so unimaginably tall!", - "It's here!" - ], - "bannerText":[ - "Buy XMDV!", - "Discounts on XMDV!", - "Imagine thinking on a piece of paper!", - "Imagine thinking on a dime!", - "Imagine thinking on a dollar!", - "The quant we created!", - "The quant we fear!", - "It's here!" - ] -} -- 2.39.2